diff --git a/test/cmd/discovery.sh b/test/cmd/discovery.sh
index 56aa7859fb1..daec7052202 100755
--- a/test/cmd/discovery.sh
+++ b/test/cmd/discovery.sh
@@ -91,7 +91,7 @@ spec:
 __EOF__
 
   # Test that we can list this new custom resource
-  kube::test::wait_object_assert customresourcedefinitions "{{range.items}}{{if eq $id_field \\\"examples.test.com\\\"}}{{$id_field}}:{{end}}{{end}}" 'examples.test.com:'
+  kube::test::wait_object_assert customresourcedefinitions "{{range.items}}{{if eq ${id_field:?} \\\"examples.test.com\\\"}}{{$id_field}}:{{end}}{{end}}" 'examples.test.com:'
 
   kubectl create -f - << __EOF__
 apiVersion: test.com/v1
@@ -169,7 +169,7 @@ spec:
 __EOF__
 
   # Test that we can list this new custom resource
-  kube::test::wait_object_assert customresourcedefinitions "{{range.items}}{{if eq $id_field \\\"examples.test.com\\\"}}{{$id_field}}:{{end}}{{end}}" 'examples.test.com:'
+  kube::test::wait_object_assert customresourcedefinitions "{{range.items}}{{if eq ${id_field:?} \\\"examples.test.com\\\"}}{{$id_field}}:{{end}}{{end}}" 'examples.test.com:'
 
   kubectl create -f - << __EOF__
 apiVersion: test.com/v1
@@ -181,7 +181,7 @@ spec:
 __EOF__
 
   # Test that we can list this new custom resource
-  kube::test::wait_object_assert examples "{{range.items}}{{${id_field:?}}}:{{end}}" 'test-crd-example:'
+  kube::test::wait_object_assert examples "{{range.items}}{{$id_field}}:{{end}}" 'test-crd-example:'
 
   output_message=$(kubectl get examples)
   kube::test::if_has_string "${output_message}" "test-crd-example"
diff --git a/test/cmd/legacy-script.sh b/test/cmd/legacy-script.sh
index 5339b1512d2..5e832df259a 100755
--- a/test/cmd/legacy-script.sh
+++ b/test/cmd/legacy-script.sh
@@ -503,13 +503,17 @@ runTests() {
   # Assert short name     #
   #########################
 
-  record_command run_assert_short_name_tests
+  if kube::test::if_supports_resource "${customresourcedefinitions}" && kube::test::if_supports_resource "${pods}" && kube::test::if_supports_resource "${configmaps}" ; then
+    record_command run_assert_short_name_tests
+  fi
 
   #########################
   # Assert singular name  #
   #########################
 
-  record_command run_assert_singular_name_tests
+  if kube::test::if_supports_resource "${customresourcedefinitions}" && kube::test::if_supports_resource "${pods}" ; then
+    record_command run_assert_singular_name_tests
+  fi
 
   #########################
   # Assert categories     #