diff --git a/deploy/kubernetes-distributed/deploy.sh b/deploy/kubernetes-distributed/deploy.sh
index 718156d6f..7c70eea39 100755
--- a/deploy/kubernetes-distributed/deploy.sh
+++ b/deploy/kubernetes-distributed/deploy.sh
@@ -233,5 +233,5 @@ fi
 # Create a test driver configuration in the place where the prow job
 # expects it?
 if [ "${CSI_PROW_TEST_DRIVER}" ]; then
-    cp "${BASE_DIR}/test-driver.yaml" "${CSI_PROW_TEST_DRIVER}"
+    sed -e "s/capacity: true/capacity: ${have_csistoragecapacity}/" >"${BASE_DIR}/test-driver.yaml" "${CSI_PROW_TEST_DRIVER}"
 fi
diff --git a/deploy/kubernetes-distributed/test-driver.yaml b/deploy/kubernetes-distributed/test-driver.yaml
index d681160d1..2bffaeeac 100644
--- a/deploy/kubernetes-distributed/test-driver.yaml
+++ b/deploy/kubernetes-distributed/test-driver.yaml
@@ -16,5 +16,8 @@ DriverInfo:
     persistence: true
     singleNodeVolume: true
     topology: true
+    capacity: true # will be adapted by deploy.sh based on cluster support for CSIStorageCapacity
+  TopologyKeys:
+  - topology.hostpath.csi/node
 InlineVolumes:
 - shared: true