diff --git a/.travis.yml b/.travis.yml
index 4f34cc4f..ad54c692 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,10 +24,22 @@ matrix:
   - rvm: 2.0
   - rvm: 2.2
     script: bundle exec rake $SUITE
-    env: SUITE="test test:docker config=test-travis-1.yaml"
+    env: SUITE="test"
   - rvm: 2.2
     script: bundle exec rake $SUITE
-    env: SUITE="test:docker config=test-travis-2.yaml"
+    env: SUITE="test:docker config=test-travis-debian.yml"
+  - rvm: 2.2
+    script: bundle exec rake $SUITE
+    env: SUITE="test:docker config=test-travis-centos.yml"
+  - rvm: 2.2
+    script: bundle exec rake $SUITE
+    env: SUITE="test:docker config=test-travis-oel.yml"
+  - rvm: 2.2
+    script: bundle exec rake $SUITE
+    env: SUITE="test:docker config=test-travis-fedora.yml"
+  - rvm: 2.2
+    script: bundle exec rake $SUITE
+    env: SUITE="test:docker config=test-travis-ubuntu.yml"
 
 deploy:
   provider: rubygems
diff --git a/test/integration/test-travis-1.yaml b/test/integration/test-travis-1.yaml
deleted file mode 100644
index 720e7ae7..00000000
--- a/test/integration/test-travis-1.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-images:
-- centos:6.6
-- centos:6.7
-- centos:7.1.1503
-- debian:7.9
-- debian:8.2
-- fedora:21
-- fedora:22
-- ubuntu:12.04
-- ubuntu:14.04
-- ubuntu:15.04
-provision:
-- script: bootstrap.sh
diff --git a/test/integration/test-travis-2.yaml b/test/integration/test-travis-2.yaml
deleted file mode 100644
index 80309796..00000000
--- a/test/integration/test-travis-2.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-images:
-- centos:5.11
-- centos:7.0.1406
-- debian:6.0.10
-- fedora:20
-- oraclelinux:5.11
-- oraclelinux:6.7
-- oraclelinux:7.1
-- ubuntu:10.04
-- ubuntu:13.04
-- ubuntu:15.10
-provision:
-- script: bootstrap.sh
diff --git a/test/integration/test-travis-centos.yml b/test/integration/test-travis-centos.yml
new file mode 100644
index 00000000..ecffb341
--- /dev/null
+++ b/test/integration/test-travis-centos.yml
@@ -0,0 +1,6 @@
+images:
+- centos:5.11
+- centos:6.8
+- centos:7.2.1511
+provision:
+- script: bootstrap.sh
diff --git a/test/integration/test-travis-debian.yml b/test/integration/test-travis-debian.yml
new file mode 100644
index 00000000..a2181fd7
--- /dev/null
+++ b/test/integration/test-travis-debian.yml
@@ -0,0 +1,6 @@
+images:
+- debian:6.0.10
+- debian:7.11
+- debian:8.5
+provision:
+- script: bootstrap.sh
diff --git a/test/integration/test-travis-fedora.yml b/test/integration/test-travis-fedora.yml
new file mode 100644
index 00000000..00a745d4
--- /dev/null
+++ b/test/integration/test-travis-fedora.yml
@@ -0,0 +1,8 @@
+images:
+- fedora:20
+- fedora:21
+- fedora:22
+- fedora:23
+- fedora:24
+provision:
+- script: bootstrap.sh
diff --git a/test/integration/test-travis-oel.yml b/test/integration/test-travis-oel.yml
new file mode 100644
index 00000000..cd3fe8ab
--- /dev/null
+++ b/test/integration/test-travis-oel.yml
@@ -0,0 +1,6 @@
+images:
+- oraclelinux:5.11
+- oraclelinux:6.8
+- oraclelinux:7.2
+provision:
+- script: bootstrap.sh
diff --git a/test/integration/test-travis-ubuntu.yml b/test/integration/test-travis-ubuntu.yml
new file mode 100644
index 00000000..68d242e5
--- /dev/null
+++ b/test/integration/test-travis-ubuntu.yml
@@ -0,0 +1,8 @@
+images:
+- ubuntu:10.04
+- ubuntu:12.04
+- ubuntu:14.04
+- ubuntu:16.04
+- ubuntu:16.10
+provision:
+- script: bootstrap.sh