diff --git a/inventory/group_vars/kerneltest b/inventory/group_vars/kerneltest
new file mode 100644
index 0000000000..478b6ad4cf
--- /dev/null
+++ b/inventory/group_vars/kerneltest
@@ -0,0 +1,27 @@
+---
+# Define resources for this group of hosts here. 
+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
+
+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]
+
+# Neeed for rsync from log02 for logs.
+custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.29 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.56 --dport 873 -j ACCEPT' ]
+
+fas_client_groups: sysadmin-noc
+
+# These are consumed by a task in roles/fedmsg/base/main.yml
+fedmsg_certs:
+- service: shell
+  owner: root
+  group: sysadmin
+- service: kerneltest
+  owner: root
+  group: apache
diff --git a/inventory/host_vars/kerneltest01.phx2.fedoraproject.org b/inventory/host_vars/kerneltest01.phx2.fedoraproject.org
new file mode 100644
index 0000000000..cc2a215967
--- /dev/null
+++ b/inventory/host_vars/kerneltest01.phx2.fedoraproject.org
@@ -0,0 +1,12 @@
+---
+nm: 255.255.255.0
+gw: 10.5.126.254
+dns: 10.5.126.21
+
+ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
+ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
+volgroup: /dev/vg_virthost
+vmhost: virthost17.phx2.fedoraproject.org
+datacenter: phx2
+
+eth0_ip: 10.5.126.136
diff --git a/inventory/inventory b/inventory/inventory
index f23638c105..4979527de4 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -277,7 +277,7 @@ hosted-lists01.fedoraproject.org
 
 [kerneltest]
 kerneltest01.phx2.fedoraproject.org
-kerneltest02.phx2.fedoraproject.org
+#kerneltest02.phx2.fedoraproject.org
 
 [kerneltest-stg]
 kerneltest01.stg.phx2.fedoraproject.org
diff --git a/playbooks/groups/kerneltest.yml b/playbooks/groups/kerneltest.yml
index 0db3800c51..5c5ab7f39a 100644
--- a/playbooks/groups/kerneltest.yml
+++ b/playbooks/groups/kerneltest.yml
@@ -4,7 +4,7 @@
 # NOTE: most of these vars_path come from group_vars/kerneltest* or from hostvars
 
 - name: make kerneltest server
-  hosts: kerneltest-stg  # kerneltest
+  hosts: kerneltest-stg:kerneltest
   user: root
   gather_facts: False
 
@@ -21,7 +21,7 @@
   - include: "{{ handlers }}/restart_services.yml"
 
 - name: make the box be real
-  hosts: kerneltest-stg  # kerneltest
+  hosts: kerneltest-stg:kerneltest
   user: root
   gather_facts: True
   accelerate: "{{ accelerated }}"
@@ -54,7 +54,7 @@
   - include: "{{ handlers }}/restart_services.yml"
 
 - name: deploy service-specific config
-  hosts: kerneltest-stg  # kerneltest
+  hosts: kerneltest-stg:kerneltest
   user: root
   gather_facts: True
   accelerate: "{{ accelerated }}"