diff --git a/.travis.yml b/.travis.yml
index 5e132dfa483f677203b03f0cada6a946cb98922a..f79990fb445935543fea8a4ab4d3e56d87fee064 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,8 +15,8 @@ matrix:
   include:
   - rvm: 2.1.9
     env: PUPPET_GEM_VERSION="~> 4.0"
-  - rvm: 2.3.1
-    env: PUPPET_GEM_VERSION="~> 4"
+  - rvm: 2.4.1
+    env: PUPPET_GEM_VERSION="~> 5.0"
   - rvm: default
     sudo: required
     dist: trusty
diff --git a/spec/acceptance/nodesets/centos-5.yml b/spec/acceptance/nodesets/centos-5.yml
index a26f27fc6e27a6d3da706fef05848da01fc14e5f..ad2b01c4370415f960172cef8bbf5db5a4dca113 100644
--- a/spec/acceptance/nodesets/centos-5.yml
+++ b/spec/acceptance/nodesets/centos-5.yml
@@ -5,7 +5,7 @@ HOSTS:
       strict_variables:
     platform: el-5-x86_64
     hypervisor : docker
-    image: tianon/centos:5.10
+    image: camptocamp/centos:5
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
diff --git a/spec/acceptance/nodesets/debian-9.yml b/spec/acceptance/nodesets/debian-9.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f1c6571eabc452f6d31a43262ed999a1550d13f5
--- /dev/null
+++ b/spec/acceptance/nodesets/debian-9.yml
@@ -0,0 +1,15 @@
+HOSTS:
+  debian-9-x64:
+    default_apply_opts:
+      order: random
+      strict_variables:
+    platform: debian-9-amd64
+    hypervisor : docker
+    image: debian:9
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y cron locales-all net-tools systemd-sysv wget'
+CONFIG:
+  type: aio
+  log_level: debug
diff --git a/spec/acceptance/nodesets/ubuntu-16.04.yml b/spec/acceptance/nodesets/ubuntu-16.04.yml
index 6c32b96dcabdc0cd57969cf028bc537827cd26fa..561ebd7c698a71bd1d13f8c9ff333f87988f0de1 100644
--- a/spec/acceptance/nodesets/ubuntu-16.04.yml
+++ b/spec/acceptance/nodesets/ubuntu-16.04.yml
@@ -9,7 +9,7 @@ HOSTS:
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
-      - 'apt-get install -y net-tools wget'
+      - 'apt-get install -y net-tools wget locales'
       - 'locale-gen en_US.UTF-8'
 CONFIG:
   type: aio