diff --git a/test/e2e/storage/drivers/csi.go b/test/e2e/storage/drivers/csi.go
index d79e0d5804a..ad3b56c6bc1 100644
--- a/test/e2e/storage/drivers/csi.go
+++ b/test/e2e/storage/drivers/csi.go
@@ -393,6 +393,7 @@ func InitGcePDCSIDriver() testsuites.TestDriver {
 				testsuites.CapFsGroup:     true,
 				testsuites.CapExec:        true,
 				testsuites.CapMultiPODs:   true,
+				testsuites.CapBlock:       true,
 				// GCE supports volume limits, but the test creates large
 				// number of volumes and times out test suites.
 				testsuites.CapVolumeLimits: false,
diff --git a/test/e2e/storage/testsuites/volumemode.go b/test/e2e/storage/testsuites/volumemode.go
index ee1a42a6624..92aeafe0f73 100644
--- a/test/e2e/storage/testsuites/volumemode.go
+++ b/test/e2e/storage/testsuites/volumemode.go
@@ -275,7 +275,7 @@ func (t *volumeModeTestSuite) defineTests(driver TestDriver, pattern testpattern
 	}
 
 	ginkgo.It("should fail to use a volume in a pod with mismatched mode [Slow]", func() {
-		skipBlockTest(driver)
+		skipTestIfBlockNotSupported(driver)
 		init()
 		l.genericVolumeTestResource = *createGenericVolumeTestResource(driver, l.config, pattern)
 		defer cleanup()
@@ -324,7 +324,7 @@ func (t *volumeModeTestSuite) defineTests(driver TestDriver, pattern testpattern
 		framework.SkipUnlessProviderIs(framework.ProvidersWithSSH...)
 		framework.SkipUnlessSSHKeyPresent()
 		if pattern.VolMode == v1.PersistentVolumeBlock {
-			skipBlockTest(driver)
+			skipTestIfBlockNotSupported(driver)
 		}
 		init()
 		l.genericVolumeTestResource = *createGenericVolumeTestResource(driver, l.config, pattern)
diff --git a/test/e2e/storage/testsuites/volumes.go b/test/e2e/storage/testsuites/volumes.go
index 7f5fe286fdb..9e357099778 100644
--- a/test/e2e/storage/testsuites/volumes.go
+++ b/test/e2e/storage/testsuites/volumes.go
@@ -89,7 +89,7 @@ func skipExecTest(driver TestDriver) {
 	}
 }
 
-func skipBlockTest(driver TestDriver) {
+func skipTestIfBlockNotSupported(driver TestDriver) {
 	dInfo := driver.GetDriverInfo()
 	if !dInfo.Capabilities[CapBlock] {
 		framework.Skipf("Driver %q does not provide raw block - skipping", dInfo.Name)
@@ -145,7 +145,7 @@ func (t *volumesTestSuite) defineTests(driver TestDriver, pattern testpatterns.T
 
 	ginkgo.It("should store data", func() {
 		if pattern.VolMode == v1.PersistentVolumeBlock {
-			skipBlockTest(driver)
+			skipTestIfBlockNotSupported(driver)
 		}
 
 		init()