diff --git a/inventory/group_vars/kerneltest b/inventory/group_vars/kerneltest
index 76858d07b7..ef3c52d0b0 100644
--- a/inventory/group_vars/kerneltest
+++ b/inventory/group_vars/kerneltest
@@ -4,13 +4,15 @@ lvm_size: 20000
 mem_size: 1024
 num_cpus: 1
 
-# for systems that do not match the above - specify the same parameter in
-# the host_vars/$hostname file
+# Definining these vars has a number of effects
+# 1) mod_wsgi is configured to use the vars for its own setup
+# 2) iptables opens enough ports for all threads for fedmsg
+# 3) roles/fedmsg/base/ declares enough fedmsg endpoints for all threads
+wsgi_fedmsg_service: kerneltest
+wsgi_procs: 2
+wsgi_threads: 1
 
-tcp_ports: [ 80, 443,
-    # These 16 ports are used by fedmsg.  One for each wsgi thread.
-    3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007,
-    3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015]
+tcp_ports: [ 80 ]
 
 # Neeed for rsync from log01 for logs.
 custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]
diff --git a/inventory/group_vars/kerneltest-stg b/inventory/group_vars/kerneltest-stg
index 76858d07b7..ef3c52d0b0 100644
--- a/inventory/group_vars/kerneltest-stg
+++ b/inventory/group_vars/kerneltest-stg
@@ -4,13 +4,15 @@ lvm_size: 20000
 mem_size: 1024
 num_cpus: 1
 
-# for systems that do not match the above - specify the same parameter in
-# the host_vars/$hostname file
+# Definining these vars has a number of effects
+# 1) mod_wsgi is configured to use the vars for its own setup
+# 2) iptables opens enough ports for all threads for fedmsg
+# 3) roles/fedmsg/base/ declares enough fedmsg endpoints for all threads
+wsgi_fedmsg_service: kerneltest
+wsgi_procs: 2
+wsgi_threads: 1
 
-tcp_ports: [ 80, 443,
-    # These 16 ports are used by fedmsg.  One for each wsgi thread.
-    3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007,
-    3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015]
+tcp_ports: [ 80 ]
 
 # Neeed for rsync from log01 for logs.
 custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]
diff --git a/roles/fedmsg/base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml
index 81dcfd9776..d5775dea67 100644
--- a/roles/fedmsg/base/tasks/main.yml
+++ b/roles/fedmsg/base/tasks/main.yml
@@ -38,6 +38,7 @@
   file: dest="/etc/fedmsg.d/{{item}}" state=absent
   with_items:
   - endpoints-nuancier.py
+  - endpoints-kerneltest.py
   tags:
   - config
   - fedmsgdconfig
@@ -69,7 +70,6 @@
   - endpoints-hotness.py
   - endpoints-mailman.py
   - endpoints-summershum.py
-  - endpoints-kerneltest.py
   - endpoints-fedimg.py
   - endpoints-github2fedmsg.py
   - endpoints-bugzilla2fedmsg.py
diff --git a/roles/fedmsg/base/templates/endpoints-kerneltest.py.j2 b/roles/fedmsg/base/templates/endpoints-kerneltest.py.j2
deleted file mode 100644
index 7caf59767d..0000000000
--- a/roles/fedmsg/base/templates/endpoints-kerneltest.py.j2
+++ /dev/null
@@ -1,20 +0,0 @@
-{% if env == 'staging' %}
-suffix  = 'stg.phx2.fedoraproject.org'
-{% else %}
-suffix = 'phx2.fedoraproject.org'
-{% endif %}
-
-config = dict(
-    endpoints={
-        "kerneltest.kerneltest01": [
-            "tcp://kerneltest01.%s:30%02i" % (suffix, i)
-            for i in range(16)
-        ],
-{% if env != 'staging' %}
-        "kerneltest.kerneltest02": [
-            "tcp://kerneltest02.%s:30%02i" % (suffix, i)
-            for i in range(16)
-        ],
-{% endif %}
-    },
-)
diff --git a/roles/kerneltest/templates/kerneltest.conf b/roles/kerneltest/templates/kerneltest.conf
index b357d148ed..13681c63ec 100644
--- a/roles/kerneltest/templates/kerneltest.conf
+++ b/roles/kerneltest/templates/kerneltest.conf
@@ -5,7 +5,7 @@ Alias /kerneltest/static /usr/lib/python2.6/site-packages/kerneltest/static/
 Alias /kerneltest/static /usr/lib/python2.7/site-packages/kerneltest/static/
 {% endif %}
 
-WSGIDaemonProcess kerneltest user=apache maximum-requests=1000 display-name=kerneltest processes=2 threads=1
+WSGIDaemonProcess kerneltest user=apache maximum-requests=1000 display-name=kerneltest processes={{wsgi_procs}} threads={{wsgi_threads}}
 WSGISocketPrefix run/wsgi
 WSGIRestrictStdout On
 WSGIRestrictSignal Off