diff --git a/contrib/test/integration/build/kubernetes.yml b/contrib/test/integration/build/kubernetes.yml
index 3a18321c..1aa8db8d 100644
--- a/contrib/test/integration/build/kubernetes.yml
+++ b/contrib/test/integration/build/kubernetes.yml
@@ -47,6 +47,8 @@
       export API_HOST={{ ansible_eth0.ipv4.address }}
       export API_HOST_IP={{ ansible_eth0.ipv4.address }}
       export KUBE_ENABLE_CLUSTER_DNS=true
+      export ENABLE_HOSTPATH_PROVISIONER=true
+      export KUBE_ENABLE_CLUSTER_DASHBOARD=true
       ./hack/local-up-cluster.sh
     mode: "u=rwx,g=rwx,o=x"
 
diff --git a/contrib/test/integration/e2e.yml b/contrib/test/integration/e2e.yml
index 5c4d656e..4dd87950 100644
--- a/contrib/test/integration/e2e.yml
+++ b/contrib/test/integration/e2e.yml
@@ -37,13 +37,14 @@
     path: "{{ artifacts }}"
     state: directory
 
+# TODO remove the last test skipped once https://github.com/kubernetes-incubator/cri-o/pull/1217 is merged
 - name: Buffer the e2e testing command to workaround Ansible YAML folding "feature"
   set_fact:
     e2e_shell_cmd: >
         /usr/bin/go run hack/e2e.go
             --test
             --test_args="-host=https://{{ ansible_default_ipv4.address }}:6443
-                        --ginkgo.focus=\[Conformance\]
+                        --ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|PersistentVolumes|\[HPA\]|should.support.building.a.client.with.a.CSR|should.support.inline.execution.and.attach
                         --report-dir={{ artifacts }}"
             &> {{ artifacts }}/e2e.log
   # Fix vim syntax hilighting: "
diff --git a/contrib/test/integration/main.yml b/contrib/test/integration/main.yml
index e5c22c03..cbbcd12e 100644
--- a/contrib/test/integration/main.yml
+++ b/contrib/test/integration/main.yml
@@ -96,8 +96,8 @@
       vars:
           force_clone: True
           # master as of 12/11/2017
-          k8s_git_version: "a48f11c2257d84b0bec89864025508b0ef626b4f"
-          k8s_github_fork: "kubernetes"
+          k8s_git_version: "master-nfs-fix"
+          k8s_github_fork: "runcom"
           crio_socket: "/var/run/crio/crio.sock"
     - name: run k8s e2e tests
       include: e2e.yml