diff --git a/tasks/main.yml b/tasks/main.yml
index 8a5a283..c3f9190 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -6,19 +6,22 @@
   setup:
 
 - name: Restart node
-  debug:
+  fail:
     msg: 'SELinux MUST be disabled, selinux has been updated, restart node now...'
   when: "{{ ansible_selinux.status | lower != 'disabled' }}"
 
-- name: Restarting node now
-  ignore_errors: yes
-  become: yes
-  shell: 'reboot now'
-  when: "{{ ansible_selinux.status | lower != 'disabled' }}"
-  async: 0
-  poll: 0
+#- name: Restarting node now
+#  ignore_errors: yes
+#  become: yes
+#  shell: 'reboot now'
+#  when: "{{ ansible_selinux.status | lower != 'disabled' }}"
+#  async: 0
+#  poll: 0
 
 #  Requires sudo on the control server
-- name: Waiting for server to complete reboot cycle
-  local_action: wait_for host='{{ inventory_hostname }}' port='{{ ansible_port }}' state=started
+#- name: Waiting for server to complete reboot cycle
+#  wait_for:
+#    host: '{{ inventory_hostname }}'
+#    port: '{{ ansible_port }}'
+#    state: started
 
diff --git a/tests/ansible.cfg b/tests/ansible.cfg
new file mode 100644
index 0000000..7eb4aee
--- /dev/null
+++ b/tests/ansible.cfg
@@ -0,0 +1,23 @@
+[defaults]
+host_key_checking = false
+hostfile = ~/.ansible/inventory/vagrant
+forks = 50
+remote_user = vagrant
+private_key_file = ~/.vagrant.d/insecure_private_key
+roles_path =../../
+log_path = ~/.ansible/tmp/ansible.log
+retry_files_enabled = False
+# executable = /bin/bash
+executable = sh
+ansible_shell_type=sh
+gathering = smart
+fact_caching = jsonfile
+fact_caching_connection = ~/.ansible/tmp/cache
+# library = ~/.ansible/library/
+# 2 hour timeout
+fact_caching_timeout = 7200
+timeout = 60
+
+[ssh_connection]
+ssh_args = -o ControlMaster=auto -o ControlPersist=7200s -o KbdInteractiveAuthentication=no -o PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey -o PasswordAuthentication=no -q
+control_path=%(directory)s/ansible-ssh-%%h-%%p-%%r
diff --git a/tests/inventory b/tests/inventory
index d18580b..5320f2e 100644
--- a/tests/inventory
+++ b/tests/inventory
@@ -1 +1,47 @@
-localhost
\ No newline at end of file
+[planet]
+127.0.0.1 ansible_port=2222
+
+[dc-1]
+127.0.0.1
+
+[ds]
+127.0.0.1
+
+[dc-1-ds]
+127.0.0.1
+
+[ldap]
+127.0.0.1
+
+[dc-1-ldap]
+127.0.0.1
+
+[ms]
+127.0.0.1
+
+[dc-1-ms]
+127.0.0.1
+
+[rmp]
+127.0.0.1
+
+[dc-1-rmp]
+127.0.0.1
+
+[qpid]
+127.0.0.1
+
+[dc-1-qpid]
+127.0.0.1
+
+[pg]
+127.0.0.1
+
+[dc-1-pg]
+127.0.0.1
+
+[ui]
+127.0.0.1
+
+[dc-1-ui]
+127.0.0.1
diff --git a/tests/test.yml b/tests/test.yml
index f07a415..ad28f1a 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -1,5 +1,12 @@
 ---
-- hosts: localhost
-  remote_user: root
+- hosts: planet
+  pre_tasks:
+  - name: Required packages for test
+    yum:
+      name: '{{ item }}'
+      state: present
+    with_items:
+    - libselinux-python
+
   roles:
-    - opdk-setup-selinux-disable
\ No newline at end of file
+    - apigee-opdk-setup-selinux-disable
\ No newline at end of file