diff --git a/Makefile b/Makefile
index eccf025..dcacbc7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,81 +1,78 @@
 # vim: set noexpandtab:
 
 ANSIBLE = ansible-playbook
 SKIP_TAGS = --skip-tags "init,common"
 PROD_BOOK = main_prod.yml
 TEST_BOOK = main_test.yml
 
 status:
 	nova list
 
 # Everything
 
 init:
 	$(ANSIBLE) $(PROD_BOOK)
 
 test-init:
 	$(ANSIBLE) $(TEST_BOOK)
 
 up:
 	$(ANSIBLE) $(PROD_BOOK) $(SKIP_TAGS)
 
 test-up:
 	$(ANSIBLE) $(TEST_BOOK) $(SKIP_TAGS)
 
 restart:
 	$(ANSIBLE) restart.yml
 
 reboot:
 	$(ANSIBLE) reboot.yml
 
 stop:
 	$(ANSIBLE) stop.yml
 
 # Specific
 
 app:
 	$(ANSIBLE) $(PROD_BOOK) --tags conf-app $(SKIP_TAGS)
 
 lbs:
 	$(ANSIBLE) $(PROD_BOOK) --tags conf-lbs $(SKIP_TAGS)
 
 monit:
 	$(ANSIBLE) $(PROD_BOOK) --tags conf-monit $(SKIP_TAGS)
 
 backup:
 	$(ANSIBLE) $(PROD_BOOK) --tags conf-backup $(SKIP_TAGS)
 
 dbs:
 	$(ANSIBLE) $(PROD_BOOK) --tags conf-dbs $(SKIP_TAGS)
 
 ci:
 	$(ANSIBLE) $(PROD_BOOK) --tags jenkins $(SKIP_TAGS)
 
 ci-slave:
 	$(ANSIBLE) $(PROD_BOOK) --tags conf-ci-slave $(SKIP_TAGS)
 
 shib:
 	$(ANSIBLE) $(PROD_BOOK) --tags conf-shib $(SKIP_TAGS)
 
 gluster:
 	$(ANSIBLE) $(PROD_BOOK) --tags gluster $(SKIP_TAGS)
 
 common:
 	$(ANSIBLE) $(PROD_BOOK) --tags common --skip-tags init
 
 # Utils
 
 update-phab:
 	$(ANSIBLE) update_phab.yml
 
 security:
 	$(ANSIBLE) security-update.yml
 
 arbitrator:
 	$(ANSIBLE) arbitrator.yml
 
-test:
-	$(ANSIBLE) test.yml
-
 clean:
 	$(ANSIBLE) cleanup.yml
diff --git a/tasks/test-instances.yml b/tasks/test-instances.yml
deleted file mode 100644
index 14aa68e..0000000
--- a/tasks/test-instances.yml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-- name: Pause app01
-  os_server_actions:
-    action: pause
-    server: c4science-app00
-    timeout: 200
-
-- name: Check HTTP connection
-  uri: url="http://{{ domain }}"
-
-- name: Check SSH connection
-  wait_for: host="{{ external_ip }}" port=22
-  delegate_to: localhost
-
-- name: Unpause app00
-  os_server_actions:
-    action: unpause
-    server: c4science-app00
-    timeout: 200
-
-- name: Pause app01
-  os_server_actions:
-    action: pause
-    server: c4science-app01
-    timeout: 200
-
-- name: Check HTTP connection
-  uri: url=http://{{ domain }}
-
-- name: Check SSH connection
-  wait_for: host={{ external_ip }} port=22
-  delegate_to: localhost
-
-- name: Unpause app01
-  os_server_actions:
-    action: unpause
-    server: c4science-app01
-    timeout: 200
diff --git a/test.yml b/test.yml
deleted file mode 100644
index 38e0169..0000000
--- a/test.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Test Instances
-  hosts: 127.0.0.1
-  connection: local
-  gather_facts: false
-  vars_files:
-    - "vars/main.yml"
-  tasks:
-    - include: tasks/test-instances.yml