diff --git a/Makefile b/Makefile
index 61a014d411..db65078bc2 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,7 @@ test-e2e-multi-az:
 .PHONY: test-e2e-migration
 test-e2e-migration:
 	AWS_REGION=us-west-2 \
-	AWS_AVAILABILITY_ZONES=us-west-2a \
+	AWS_AVAILABILITY_ZONES=us-west-2a,us-west-2b,us-west-2c \
 	TEST_PATH=./tests/e2e-kubernetes/... \
 	GINKGO_FOCUS="\[ebs-csi-migration\]" \
 	EBS_CHECK_MIGRATION=true \
@@ -102,7 +102,7 @@ test-e2e-migration:
 .PHONY: test-e2e-external
 test-e2e-external:
 	AWS_REGION=us-west-2 \
-	AWS_AVAILABILITY_ZONES=us-west-2a \
+	AWS_AVAILABILITY_ZONES=us-west-2a,us-west-2b,us-west-2c \
 	TEST_PATH=./tests/e2e-kubernetes/... \
 	GINKGO_FOCUS="External.Storage" \
 	GINKGO_SKIP="\[Disruptive\]|\[Serial\]" \
diff --git a/tests/e2e-kubernetes/manifests.yaml b/tests/e2e-kubernetes/manifests.yaml
index e6d302be64..cdee83b1fe 100644
--- a/tests/e2e-kubernetes/manifests.yaml
+++ b/tests/e2e-kubernetes/manifests.yaml
@@ -22,8 +22,10 @@ DriverInfo:
     fsGroup: true
     block: true
     exec: true
-    volumeLimits: false
-    controllerExpansion: true
-    nodeExpansion: true
     snapshotDataSource: true
+    pvcDataSource: false
     multipods: true
+    controllerExpansion: true
+    nodeExpansion: true
+    volumeLimits: true
+    topology: true