diff --git a/base.yml b/base.yml
index ea5eebfe35761161492319f094ff3f8a40290904..e47574e958f45f4c316aab5af670ae95db1d5cfd 100644
--- a/base.yml
+++ b/base.yml
@@ -1,14 +1,11 @@
 ---
 # Deploy common Crans configuration and tools
-- hosts: server
+- hosts: server,test_vm
   vars:
     # Debian mirror on adm
     debian_mirror: http://mirror.adm.crans.org/debian
     debian_components: main non-free
 
-    # Backup password
-    backuppc_rsyncd_passwd: "{{ vault_backuppc_rsyncd_passwd }}"
-
     # NTP servers
     # TODO get this list with re2o
     ntp_servers:
@@ -18,10 +15,17 @@
     - debian-apt-sources
     - common-security
     - common-tools
-    - rsync-client
     - ntp-client
     - nfs-common
 
+# Deploy backup system
+- hosts: server
+  vars:
+    # Backup password
+    backuppc_rsyncd_passwd: "{{ vault_backuppc_rsyncd_passwd }}"
+  roles:
+    - rsync-client
+
 # Plug LDAP on all servers
 - hosts: server
   vars:
diff --git a/clean_servers.yml b/clean_servers.yml
index 3b5142492a0f7e4c302d897a7defa233a9e50b13..91412a6b75462f9cd1a72d3c244f6d2df7fb8d3f 100644
--- a/clean_servers.yml
+++ b/clean_servers.yml
@@ -2,7 +2,7 @@
 # This is a special playbook to clean old stuff from BCFG2
 # it will disapear when BCFG2 will disapear
 # `apt-mark showmanual` is a good start
-- hosts: server
+- hosts: server,test_vm
   tasks:
     - name: Clean up unused packages
       apt:
diff --git a/hosts b/hosts
index 0ad20421a67450669780808d7aee4cd48ce6c530..4131e7de9fe2a91ce1fd921fe1d2995e69982d22 100644
--- a/hosts
+++ b/hosts
@@ -4,6 +4,9 @@
 # > We name servers according to location, then type.
 # > Then we regroup everything in global geographic and type groups.
 
+[test_vm]
+re2o-test.adm.crans.org
+
 [crans_physical]
 charybde.adm.crans.org
 cochon.adm.crans.org
diff --git a/monitoring.yml b/monitoring.yml
index 4227b3ec293e0cf2bdb48c0e37ea113899210242..9896897765bc1c5b9a17d3c683952336e047e17b 100644
--- a/monitoring.yml
+++ b/monitoring.yml
@@ -26,7 +26,7 @@
     - prometheus-blackbox-exporter
 
 # Monitor all hosts
-- hosts: server
+- hosts: server,test_vm
   roles:
     - prometheus-node-exporter