diff --git a/.redhat-ci.ssh-config b/.redhat-ci.ssh-config
new file mode 100644
index 00000000..67c15319
--- /dev/null
+++ b/.redhat-ci.ssh-config
@@ -0,0 +1,4 @@
+Host vmcheck
+     UserKnownHostsFile /dev/null
+     StrictHostKeyChecking no
+     PasswordAuthentication no
diff --git a/.redhat-ci.yml b/.redhat-ci.yml
index 2b0a4d10..797f0e6d 100644
--- a/.redhat-ci.yml
+++ b/.redhat-ci.yml
@@ -3,6 +3,8 @@ branches:
     - auto
     - try
 
+context: check
+
 container:
     image: projectatomic/ostree-tester
 
@@ -48,14 +50,6 @@ artifacts:
 
 inherit: true
 
-tests:
-    - ./autogen.sh
-        --prefix=/usr
-        --libdir=/usr/lib64
-        --enable-installed-tests
-        --enable-gtk-doc CC=clang
-    - make -j2
-
 context: Clang
 
 env:
@@ -64,3 +58,23 @@ env:
 
 tests:
 artifacts:
+
+---
+
+inherit: true
+
+context: vmcheck
+
+cluster:
+  hosts:
+    - name: vmcheck
+      distro: fedora/24/atomic
+  container:
+    image: projectatomic/ostree-tester
+
+tests:
+  - cp .redhat-ci.ssh-config ssh-config
+  - make vmcheck
+
+artifacts:
+  - vmcheck.log