diff --git a/tools/g2/lib/kube.sh b/tools/g2/lib/kube.sh
index 578bfef2..568d386e 100644
--- a/tools/g2/lib/kube.sh
+++ b/tools/g2/lib/kube.sh
@@ -50,19 +50,19 @@ kubectl_wait_for_node_ready() {
     NODE_NAME=${2}
     SEC=${3:-300}
 
-    log Waiting $SEC seconds for $NODE_NAME to be ready.
+    log Waiting "${SEC}" seconds for "${NODE_NAME}" to be ready.
 
     NODE_READY_JSONPATH='{.status.conditions[?(@.type=="Ready")].status}'
 
-    end=$(($(date +%s) + $SEC))
+    end=$(($(date +%s) + SEC))
     while true; do
-        if (kubectl_cmd "${VIA}" --request-timeout 10s get nodes $NODE_NAME -o jsonpath="${NODE_READY_JSONPATH}" | grep True) ; then
-            log Node $NODE_NAME is ready.
+        if (kubectl_cmd "${VIA}" --request-timeout 10s get nodes "${NODE_NAME}" -o jsonpath="${NODE_READY_JSONPATH}" | grep True) ; then
+            log Node "${NODE_NAME}" is ready.
             break
         else
             now=$(date +%s)
-            if [ $now -gt $end ]; then
-                log Node $NODE_NAME was not ready before timeout.
+            if [ "${now}" -gt "${end}" ]; then
+                log Node "${NODE_NAME}" was not ready before timeout.
                 fail
             fi
             echo -n .
diff --git a/tools/zuul/playbooks/unit-py35.yaml b/tools/zuul/playbooks/make-tests.yaml
similarity index 89%
rename from tools/zuul/playbooks/unit-py35.yaml
rename to tools/zuul/playbooks/make-tests.yaml
index f0c531f3..4b74e4c6 100644
--- a/tools/zuul/playbooks/unit-py35.yaml
+++ b/tools/zuul/playbooks/make-tests.yaml
@@ -12,9 +12,9 @@
 
 - hosts: primary
   tasks:
-    - name: Execute the make target for unit testing
+    - name: Execute the make target for basic testing
       make:
         chdir: "{{ zuul.project.src_dir }}"
-        target: tests-unit
+        target: tests
       register: result
       failed_when: result.failed