diff --git a/tests/assets/layered_deployment_templates/layered_deployment.template.json b/tests/assets/test_solution_shared_lib/layered_deployment.template.json
similarity index 100%
rename from tests/assets/layered_deployment_templates/layered_deployment.template.json
rename to tests/assets/test_solution_shared_lib/layered_deployment.template.json
diff --git a/tests/assets/layered_deployment_templates/layered_deployment.template_with_flattened_props.json b/tests/assets/test_solution_shared_lib/layered_deployment.template_with_flattened_props.json
similarity index 100%
rename from tests/assets/layered_deployment_templates/layered_deployment.template_with_flattened_props.json
rename to tests/assets/test_solution_shared_lib/layered_deployment.template_with_flattened_props.json
diff --git a/tests/test_iotedgedev_layereddeployments.py b/tests/test_iotedgedev_layereddeployments.py
index e19d715..2d1bdad 100644
--- a/tests/test_iotedgedev_layereddeployments.py
+++ b/tests/test_iotedgedev_layereddeployments.py
@@ -1,5 +1,3 @@
-from iotedgedev.envvars import EnvVars
-from iotedgedev.output import Output
 import os
 import pytest
 from .utility import (
@@ -13,13 +11,6 @@ tests_dir = os.path.join(os.getcwd(), "tests")
 test_solution_shared_lib_dir = os.path.join(tests_dir, "assets", "test_solution_shared_lib")
 
 
-@pytest.fixture(scope="module", autouse=True)
-def setup_dotenv():
-    output = Output()
-    envvars = EnvVars(output)
-    envvars.set_envvar("MODULES_PATH", "../test_solution_shared_lib/modules")
-
-
 @pytest.mark.parametrize(
     "test_file_name",
     [
@@ -30,7 +21,7 @@ def setup_dotenv():
 def test_build_and_push(test_file_name):
     os.chdir(test_solution_shared_lib_dir)
 
-    result = runner_invoke(['build', '--push', '-f', f'../layered_deployment_templates/{test_file_name}', '-P', get_platform_type()])
+    result = runner_invoke(['build', '--push', '-f', test_file_name, '-P', get_platform_type()])
 
     assert 'sample_module:0.0.1-RC' in result.output
     assert 'BUILD COMPLETE' in result.output