diff --git a/test/e2e/predictor/test_pmml.py b/test/e2e/predictor/test_pmml.py
index 19306fd0029..fd852426a4b 100644
--- a/test/e2e/predictor/test_pmml.py
+++ b/test/e2e/predictor/test_pmml.py
@@ -36,7 +36,7 @@ def test_pmml_kfserving():
         predictor=V1alpha2PredictorSpec(
             min_replicas=1,
             pmml=V1alpha2PMMLSpec(
-                storage_uri='gs://anyisalin-model-store/pmml',
+                storage_uri='gs://kfserving-samples/models/tensorflow/flowers',
                 resources=V1ResourceRequirements(
                     requests={'cpu': '100m', 'memory': '256Mi'},
                     limits={'cpu': '100m', 'memory': '256Mi'}))))
@@ -48,7 +48,7 @@ def test_pmml_kfserving():
                                     spec=V1alpha2InferenceServiceSpec(default=default_endpoint_spec))
 
     KFServing.create(isvc)
-    KFServing.wait_isvc_ready(service_name, namespace=KFSERVING_TEST_NAMESPACE)
+    KFServing.wait_isvc_ready(service_name, namespace=KFSERVING_TEST_NAMESPACE, timeout_seconds=3000)
     res = predict(service_name, './data/pmml_input.json')
     assert(res["predictions"] == [[1.0, 0.0, 0.0, "2"]])
     KFServing.delete(service_name, KFSERVING_TEST_NAMESPACE)
diff --git a/test/scripts/run-e2e-tests.sh b/test/scripts/run-e2e-tests.sh
index b59c0b4f082..67b57209f5d 100755
--- a/test/scripts/run-e2e-tests.sh
+++ b/test/scripts/run-e2e-tests.sh
@@ -77,7 +77,7 @@ kubectl config set-context $(kubectl config current-context) --namespace=default
 echo "Grant cluster-admin permissions to the current user ..."
 kubectl create clusterrolebinding cluster-admin-binding \
   --clusterrole=cluster-admin \
-  --user=$(gcloud config get-value core/account)
+  --user=$(gcloud config get-value core/account) --dry-run -o yaml | kubectl apply -f -
 
 # Install and Initialize Helm
 wget https://get.helm.sh/helm-v3.0.2-linux-amd64.tar.gz
@@ -85,7 +85,7 @@ tar xvf helm-v3.0.2-linux-amd64.tar.gz
 mv linux-amd64/helm /usr/local/bin/
 
 echo "Install istio ..."
-mkdir istio_tmp
+[ -d istio_tmp ] || (mkdir istio_tmp && \
 pushd istio_tmp >/dev/null
   curl -L https://git.io/getLatestIstio | ISTIO_VERSION=${ISTIO_VERSION} sh -
   cd istio-${ISTIO_VERSION}
@@ -137,7 +137,7 @@ pushd istio_tmp >/dev/null
   > ./istio-local-gateway.yaml
 
   kubectl apply -f istio-local-gateway.yaml
-popd
+popd)
 
 echo "Waiting for istio started ..."
 waiting_pod_running "istio-system"
@@ -165,7 +165,7 @@ sleep 120  # Wait for webhook install finished totally.
 echo "Install KFServing ..."
 export GOPATH="$HOME/go"
 export PATH="${PATH}:${GOPATH}/bin"
-mkdir -p ${GOPATH}/src/github.com/kubeflow
+[ -d ${GOPATH}/src/github.com/kubeflow ] || mkdir -p ${GOPATH}/src/github.com/kubeflow
 cp -rf ../kfserving ${GOPATH}/src/github.com/kubeflow
 cd ${GOPATH}/src/github.com/kubeflow/kfserving
 make deploy-ci
diff --git a/test/workflows/components/workflows.libsonnet b/test/workflows/components/workflows.libsonnet
index f67821f05c0..e09e9182baa 100644
--- a/test/workflows/components/workflows.libsonnet
+++ b/test/workflows/components/workflows.libsonnet
@@ -269,6 +269,10 @@
                     name: "build-sklearnserver",
                     template: "build-sklearnserver",
                   },
+                  {
+                    name: "build-pmmlserver",
+                    template: "build-pmmlserver",
+                  },
                 ],
                 [
                   {
@@ -357,6 +361,9 @@
             $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("build-sklearnserver", testWorkerImage, [
               "test/scripts/build-python-image.sh", "sklearn.Dockerfile", "sklearnserver", "latest"
             ]),  // build-sklearnserver
+            $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("build-pmmlserver", testWorkerImage, [
+              "test/scripts/build-python-image.sh", "pmml.Dockerfile", "pmmlserver", "latest"
+            ]),  // build-pmmlserver
             $.parts(namespace, name, overrides).e2e(prow_env, bucket).buildTemplate("unit-test", testWorkerImage, [
               "test/scripts/unit-test.sh",
             ]),  // unit test