diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go
index 21ccea1ff..1f3a8f6ca 100644
--- a/e2e/e2e_test.go
+++ b/e2e/e2e_test.go
@@ -77,4 +77,14 @@ func handleFlags() {
 	framework.RegisterClusterFlags(flag.CommandLine)
 	testing.Init()
 	flag.Parse()
+
+	// testNFS will automatically be enabled when testCephFS is enabled,
+	// this makes sure the NFS tests run in the CI where there are
+	// different jobs for CephFS and RBD. With a dedicated testNFS
+	// variable, it is still possible to only run the NFS tests, when both
+	// CephFS and RBD are disabled.
+	if testCephFS {
+		testNFS = testCephFS
+		deployNFS = deployCephFS
+	}
 }
diff --git a/e2e/nfs.go b/e2e/nfs.go
index 058670908..dfa7a6b5f 100644
--- a/e2e/nfs.go
+++ b/e2e/nfs.go
@@ -239,7 +239,7 @@ var _ = Describe("nfs", func() {
 	var c clientset.Interface
 	// deploy CephFS CSI
 	BeforeEach(func() {
-		if !testNFS || upgradeTesting {
+		if !testNFS || upgradeTesting || helmTest {
 			Skip("Skipping NFS E2E")
 		}
 		c = f.ClientSet