diff --git a/barbican/templates/pod-test.yaml b/barbican/templates/pod-test.yaml
index 0715557e5d..56ec35dbd6 100644
--- a/barbican/templates/pod-test.yaml
+++ b/barbican/templates/pod-test.yaml
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */}}
 
+{{- if .Values.manifests.pod_test }}
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.tests }}
 
@@ -55,3 +56,4 @@ spec:
         name: barbican-bin
         defaultMode: 0555
 {{ if $mounts_barbican_tests.volumes }}{{ toYaml $mounts_barbican_tests.volumes | indent 4 }}{{ end }}
+{{- end }}
diff --git a/barbican/values.yaml b/barbican/values.yaml
index 70ae4d004b..7e5023fbd7 100644
--- a/barbican/values.yaml
+++ b/barbican/values.yaml
@@ -484,6 +484,7 @@ manifests:
   job_ks_service: true
   job_ks_user: true
   pdb_api: true
+  pod_test: true
   secret_db: true
   secret_keystone: true
   service_ingress_api: true