diff --git a/clusterloader2/testing/experimental/storage/pod-startup/ephemeral-volumes/1_node/README.md b/clusterloader2/testing/experimental/storage/pod-startup/ephemeral-volumes/1_node/README.md
index df1cca74e3..8dbe10daaa 100644
--- a/clusterloader2/testing/experimental/storage/pod-startup/ephemeral-volumes/1_node/README.md
+++ b/clusterloader2/testing/experimental/storage/pod-startup/ephemeral-volumes/1_node/README.md
@@ -7,4 +7,4 @@ Below test cases can be run with the parameters like;
 
 To test with different volume types please use the override file for the specific volume type, default volume type is `EmptyDir`
 
-To test for the max volume per node test case please use override file under `max_volumes_per_node`, default test case is max volume per node.
+There are two different test cases and different override files for each of them, under the `max_volumes_per_pod` and `max_volumes_per_node` directories, default test case is max volume per pod.
diff --git a/clusterloader2/testing/experimental/storage/pod-startup/ephemeral-volumes/1_node/config.yaml b/clusterloader2/testing/experimental/storage/pod-startup/ephemeral-volumes/1_node/config.yaml
index d336ceb71b..9236d644bb 100644
--- a/clusterloader2/testing/experimental/storage/pod-startup/ephemeral-volumes/1_node/config.yaml
+++ b/clusterloader2/testing/experimental/storage/pod-startup/ephemeral-volumes/1_node/config.yaml
@@ -3,7 +3,7 @@
 
 #Constants
 {{$TOTAL_PODS := DefaultParam .TOTAL_PODS 1}}
-{{$POD_TEMPLATE_PATH := DefaultParam .POD_TEMPLATE_PATH "pod_with_emptydir.yaml"}}
+{{$POD_TEMPLATE_PATH := DefaultParam .POD_TEMPLATE_PATH "emptydir/pod_with_emptydir.yaml"}}
 {{$LOAD_TEST_THROUGHPUT := DefaultParam .LOAD_TEST_THROUGHPUT 10}}
 
 {{$VOLUMES_PER_POD := DefaultParam .VOLUMES_PER_POD 100}}
diff --git a/clusterloader2/testing/experimental/storage/pod-startup/ephemeral-volumes/1_node/emptydir/override.yaml b/clusterloader2/testing/experimental/storage/pod-startup/ephemeral-volumes/1_node/emptydir/override.yaml
new file mode 100644
index 0000000000..d369a28b6b
--- /dev/null
+++ b/clusterloader2/testing/experimental/storage/pod-startup/ephemeral-volumes/1_node/emptydir/override.yaml
@@ -0,0 +1 @@
+POD_TEMPLATE_PATH: "emptydir/pod_with_emptydir.yaml"
diff --git a/clusterloader2/testing/experimental/storage/pod-startup/ephemeral-volumes/1_node/pod_with_emptydir.yaml b/clusterloader2/testing/experimental/storage/pod-startup/ephemeral-volumes/1_node/emptydir/pod_with_emptydir.yaml
similarity index 100%
rename from clusterloader2/testing/experimental/storage/pod-startup/ephemeral-volumes/1_node/pod_with_emptydir.yaml
rename to clusterloader2/testing/experimental/storage/pod-startup/ephemeral-volumes/1_node/emptydir/pod_with_emptydir.yaml
diff --git a/clusterloader2/testing/experimental/storage/pod-startup/ephemeral-volumes/1_node/max_volumes_per_pod/override.yaml b/clusterloader2/testing/experimental/storage/pod-startup/ephemeral-volumes/1_node/max_volumes_per_pod/override.yaml
new file mode 100644
index 0000000000..0e89356c73
--- /dev/null
+++ b/clusterloader2/testing/experimental/storage/pod-startup/ephemeral-volumes/1_node/max_volumes_per_pod/override.yaml
@@ -0,0 +1,2 @@
+TOTAL_PODS: 1
+VOLUMES_PER_POD: 100