diff --git a/tools/deployment/multinode/140-compute-kit.sh b/tools/deployment/multinode/140-compute-kit.sh
index 065de2b00d..faeb83ab17 100755
--- a/tools/deployment/multinode/140-compute-kit.sh
+++ b/tools/deployment/multinode/140-compute-kit.sh
@@ -176,5 +176,7 @@ openstack network agent list
 # Delete the test pods if they still exist
 kubectl delete pods -l application=nova,release_group=nova,component=test --namespace=openstack --ignore-not-found
 kubectl delete pods -l application=neutron,release_group=neutron,component=test --namespace=openstack --ignore-not-found
-helm test nova --timeout 900
-helm test neutron --timeout 900
+
+timeout=${OSH_TEST_TIMEOUT:-900}
+helm test nova --timeout $timeout
+helm test neutron --timeout $timeout