diff --git a/test/e2e/storage/testsuites/provisioning.go b/test/e2e/storage/testsuites/provisioning.go
index 4c03b002807..e5d83e8588d 100644
--- a/test/e2e/storage/testsuites/provisioning.go
+++ b/test/e2e/storage/testsuites/provisioning.go
@@ -89,6 +89,7 @@ func createProvisioningTestInput(driver TestDriver, pattern testpatterns.TestPat
 		testCase: StorageClassTest{
 			ClaimSize:    resource.claimSize,
 			ExpectedSize: resource.claimSize,
+			NodeName:     driver.GetDriverInfo().Config.ClientNodeName,
 		},
 		cs:    driver.GetDriverInfo().Config.Framework.ClientSet,
 		dc:    driver.GetDriverInfo().Config.Framework.DynamicClient,
@@ -98,10 +99,6 @@ func createProvisioningTestInput(driver TestDriver, pattern testpatterns.TestPat
 		dInfo: driver.GetDriverInfo(),
 	}
 
-	if driver.GetDriverInfo().Config.ClientNodeName != "" {
-		input.testCase.NodeName = driver.GetDriverInfo().Config.ClientNodeName
-	}
-
 	return resource, input
 }
 
@@ -440,6 +437,7 @@ func runInPodWithVolume(c clientset.Interface, ns, claimName, nodeName, command
 			GenerateName: "pvc-volume-tester-",
 		},
 		Spec: v1.PodSpec{
+			NodeName: nodeName,
 			Containers: []v1.Container{
 				{
 					Name:    "volume-tester",
@@ -470,9 +468,6 @@ func runInPodWithVolume(c clientset.Interface, ns, claimName, nodeName, command
 		},
 	}
 
-	if len(nodeName) != 0 {
-		pod.Spec.NodeName = nodeName
-	}
 	pod, err := c.CoreV1().Pods(ns).Create(pod)
 	framework.ExpectNoError(err, "Failed to create pod: %v", err)
 	defer func() {
diff --git a/test/e2e/storage/testsuites/snapshottable.go b/test/e2e/storage/testsuites/snapshottable.go
index a6969cb888d..98f4ca0c8e6 100644
--- a/test/e2e/storage/testsuites/snapshottable.go
+++ b/test/e2e/storage/testsuites/snapshottable.go
@@ -91,18 +91,17 @@ func createSnapshottableTestInput(driver TestDriver, pattern testpatterns.TestPa
 	resource := snapshottableTestResource{}
 	resource.setupResource(driver, pattern)
 
+	dInfo := driver.GetDriverInfo()
 	input := snapshottableTestInput{
-		testCase: SnapshotClassTest{},
-		cs:       driver.GetDriverInfo().Config.Framework.ClientSet,
-		dc:       driver.GetDriverInfo().Config.Framework.DynamicClient,
-		pvc:      resource.pvc,
-		sc:       resource.sc,
-		vsc:      resource.vsc,
-		dInfo:    driver.GetDriverInfo(),
-	}
-
-	if driver.GetDriverInfo().Config.ClientNodeName != "" {
-		input.testCase.NodeName = driver.GetDriverInfo().Config.ClientNodeName
+		testCase: SnapshotClassTest{
+			NodeName: dInfo.Config.ClientNodeName,
+		},
+		cs:    dInfo.Config.Framework.ClientSet,
+		dc:    dInfo.Config.Framework.DynamicClient,
+		pvc:   resource.pvc,
+		sc:    resource.sc,
+		vsc:   resource.vsc,
+		dInfo: dInfo,
 	}
 
 	return resource, input