diff --git a/contrib/post_test_hook.sh b/contrib/post_test_hook.sh
index 9d0347c..84152c3 100755
--- a/contrib/post_test_hook.sh
+++ b/contrib/post_test_hook.sh
@@ -18,12 +18,6 @@ BASE_DIR=$(cd $(dirname $BASH_SOURCE)/.. && pwd)
 
 
 TESTS_LIST_REGEX=(
-    '\[Slow\]'
-    '\[Serial\]'
-    '\[Disruptive\]'
-    '\[Flaky\]'
-    '\[Feature:.+\]'
-    '\[HPA\]'
 )
 
 FLAKY_TESTS_LIST=(
@@ -90,7 +84,7 @@ echo "Waiting for kubernetes service to start..."
 for i in {1..600}
 do
     if [[ -f $KUBECONFIG ]]; then
-        running_count=$(./kubectl get svc --no-headers 2>/dev/null | grep "kubernetes" | wc -l)
+        running_count=$(./kubectl get nodes --no-headers 2>/dev/null | grep "Ready" | wc -l)
         if [ "$running_count" -ge 1 ]; then
             break
         fi
@@ -126,6 +120,8 @@ echo "Dump Kubernetes Objects..."
 ./kubectl get serviceaccounts
 ./kubectl get services
 
+./kubectl get nodes -o json
+
 echo "Create a default StorageClass since we do not have a cloud provider"
 ./kubectl create -f - <<EOF || true
 kind: StorageClass
@@ -156,12 +152,18 @@ pushd $GOPATH/src/k8s.io/kubernetes >/dev/null
 sudo -E PATH=$GOPATH/bin:$PATH make all WHAT=cmd/kubectl
 sudo -E PATH=$GOPATH/bin:$PATH make all WHAT=vendor/github.com/onsi/ginkgo/ginkgo
 
+# open up access for containers
 sudo ifconfig -a
 sudo iptables -t nat -A POSTROUTING -o ens3 -s 10.0.0.0/24 -j MASQUERADE
 sudo iptables -t nat -A POSTROUTING -o ens3 -s 172.17.0.0/24 -j MASQUERADE
 sudo iptables -t nat -A POSTROUTING -o eth0 -s 10.0.0.0/24 -j MASQUERADE
 sudo iptables -t nat -A POSTROUTING -o eth0 -s 172.17.0.0/24 -j MASQUERADE
 
+# Pending review in kubernetes/kubernetes - https://github.com/kubernetes/kubernetes/pull/45142
+sudo pip install git-pr
+sudo git remote update
+sudo git pr origin 45142
+
 sudo -E PATH=$GOPATH/bin:$PATH make all WHAT=test/e2e/e2e.test
-sudo -E PATH=$GOPATH/bin:$PATH go run hack/e2e.go -- -v --test --test_args="--ginkgo.trace=true --ginkgo.seed=1378936983 --logtostderr --v 4 --provider=local --report-dir=/opt/stack/logs/ --ginkgo.v --ginkgo.skip=$(test_names)"
+sudo -E PATH=$GOPATH/bin:$PATH go run hack/e2e.go -- -v --test --test_args="--ginkgo.trace=true --ginkgo.seed=1378936983 --logtostderr --v 4 --provider=local --report-dir=/opt/stack/logs/ --ginkgo.v --ginkgo.focus=$(test_names)"
 popd >/dev/null
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 6136c94..396b498 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -77,7 +77,12 @@ function install_k8s_cloud_provider {
         pushd ${K8S_SRC} >/dev/null
         git remote update
         git fetch --all --tags --prune
-        #git checkout tags/v1.7.0-alpha.1
+
+        # Pending review in kubernetes/kubernetes - https://github.com/kubernetes/kubernetes/pull/45161
+        sudo pip install git-pr
+        sudo git remote update
+        sudo git pr origin 45161
+
         popd >/dev/null
     fi
 
@@ -105,6 +110,7 @@ function install_k8s_cloud_provider {
     export API_HOST_IP="172.17.0.1"
     export KUBELET_HOST="0.0.0.0"
     export ENABLE_CRI=false
+    export HOSTNAME_OVERRIDE=$(ip route get 1.1.1.1 | awk '{print $7}')
 
 #    echo "Stop Docker iptable rules that interfere with kubedns"
 #    sudo iptables -D FORWARD -j DOCKER-ISOLATION