diff --git a/tests/conftest.py b/tests/conftest.py
index 03395fabc7..9a8f9dbfba 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -2507,6 +2507,11 @@ def rwx_fs_available_storage_classes_names(cluster_storage_classes_names):
     ]
 
 
+@pytest.fixture()
+def storage_class_name_scope_function(storage_class_matrix__function__):
+    return [*storage_class_matrix__function__][0]
+
+
 @pytest.fixture(scope="session")
 def rhsm_credentials_from_bitwarden():
     return get_cnv_tests_secret_by_name(secret_name="RHSM_CREDENTIALS")
diff --git a/tests/infrastructure/golden_images/test_common_templates_data_volumes.py b/tests/infrastructure/golden_images/test_common_templates_data_volumes.py
index 4aa80350b7..8fdfed6dcd 100644
--- a/tests/infrastructure/golden_images/test_common_templates_data_volumes.py
+++ b/tests/infrastructure/golden_images/test_common_templates_data_volumes.py
@@ -16,9 +16,9 @@
 
 @pytest.fixture()
 def vm_from_golden_image_multi_storage(
-    request,
     unprivileged_client,
     namespace,
+    storage_class_name_scope_function,
     golden_image_data_source_multi_storage_scope_function,
 ):
     with VirtualMachineForTests(
@@ -28,6 +28,7 @@ def vm_from_golden_image_multi_storage(
         vm_instance_type=VirtualMachineClusterInstancetype(name=U1_SMALL),
         data_volume_template=data_volume_template_with_source_ref_dict(
             data_source=golden_image_data_source_multi_storage_scope_function,
+            storage_class=storage_class_name_scope_function,
         ),
     ) as vm:
         running_vm(vm=vm)
diff --git a/tests/storage/conftest.py b/tests/storage/conftest.py
index 9df024ccd5..e45fed06e5 100644
--- a/tests/storage/conftest.py
+++ b/tests/storage/conftest.py
@@ -496,11 +496,6 @@ def data_volume_template_metadata(multi_storage_cirros_vm):
     return multi_storage_cirros_vm.data_volume_template["metadata"]
 
 
-@pytest.fixture()
-def storage_class_name_scope_function(storage_class_matrix__function__):
-    return [*storage_class_matrix__function__][0]
-
-
 @pytest.fixture(scope="module")
 def storage_class_name_scope_module(storage_class_matrix__module__):
     return [*storage_class_matrix__module__][0]
diff --git a/utilities/storage.py b/utilities/storage.py
index 90437a3af3..206fb36840 100644
--- a/utilities/storage.py
+++ b/utilities/storage.py
@@ -561,12 +561,11 @@ def data_volume_template_dict(
 
 
 def data_volume_template_with_source_ref_dict(data_source, storage_class=None):
-    source_dict = data_source.source.instance.to_dict()
     dv = DataVolume(
         name=utilities.infra.unique_name(name=data_source.name),
         namespace=data_source.namespace,
         size=get_dv_size_from_datasource(data_source=data_source),
-        storage_class=storage_class or source_dict["spec"].get("storageClassName"),
+        storage_class=storage_class,
         api_name="storage",
         source_ref={
             "kind": data_source.kind,