diff --git a/tests/conftest.py b/src/tests/conftest.py
similarity index 95%
rename from tests/conftest.py
rename to src/tests/conftest.py
index a2c03d36f..1306e472e 100644
--- a/tests/conftest.py
+++ b/src/tests/conftest.py
@@ -7,7 +7,7 @@
 import pytest
 
 # the following assumes that the testconf.py is in the tests directory.
-volttron_src_path = Path(__file__).resolve().parent.parent.joinpath("src")
+volttron_src_path = Path(__file__).resolve().parent.parent
 
 assert volttron_src_path.exists()
 
diff --git a/tests/unit/module_for_testing/module_data.py b/src/tests/unit/module_for_testing/module_data.py
similarity index 100%
rename from tests/unit/module_for_testing/module_data.py
rename to src/tests/unit/module_for_testing/module_data.py
diff --git a/tests/unit/module_for_testing/module_no_classes_data.py b/src/tests/unit/module_for_testing/module_no_classes_data.py
similarity index 100%
rename from tests/unit/module_for_testing/module_no_classes_data.py
rename to src/tests/unit/module_for_testing/module_no_classes_data.py
diff --git a/tests/unit/test_subsystems.py b/src/tests/unit/test_subsystems.py
similarity index 100%
rename from tests/unit/test_subsystems.py
rename to src/tests/unit/test_subsystems.py
diff --git a/tests/unit/utils/test_client_context.py b/src/tests/unit/utils/test_client_context.py
similarity index 100%
rename from tests/unit/utils/test_client_context.py
rename to src/tests/unit/utils/test_client_context.py
diff --git a/tests/unit/utils/test_dynamic_helper.py b/src/tests/unit/utils/test_dynamic_helper.py
similarity index 100%
rename from tests/unit/utils/test_dynamic_helper.py
rename to src/tests/unit/utils/test_dynamic_helper.py
diff --git a/tests/unit/utils/test_environment_vars.py b/src/tests/unit/utils/test_environment_vars.py
similarity index 100%
rename from tests/unit/utils/test_environment_vars.py
rename to src/tests/unit/utils/test_environment_vars.py
diff --git a/tests/unit/utils/test_frame_serialization.py b/src/tests/unit/utils/test_frame_serialization.py
similarity index 100%
rename from tests/unit/utils/test_frame_serialization.py
rename to src/tests/unit/utils/test_frame_serialization.py
diff --git a/tests/unit/utils/test_frozendict.py b/src/tests/unit/utils/test_frozendict.py
similarity index 100%
rename from tests/unit/utils/test_frozendict.py
rename to src/tests/unit/utils/test_frozendict.py
diff --git a/tests/unit/utils/test_gevent.py b/src/tests/unit/utils/test_gevent.py
similarity index 100%
rename from tests/unit/utils/test_gevent.py
rename to src/tests/unit/utils/test_gevent.py
diff --git a/tests/unit/utils/test_keystore.py b/src/tests/unit/utils/test_keystore.py
similarity index 100%
rename from tests/unit/utils/test_keystore.py
rename to src/tests/unit/utils/test_keystore.py
diff --git a/tests/unit/utils/test_load_utils.py b/src/tests/unit/utils/test_load_utils.py
similarity index 100%
rename from tests/unit/utils/test_load_utils.py
rename to src/tests/unit/utils/test_load_utils.py
diff --git a/tests/unit/utils/test_math_utils.py b/src/tests/unit/utils/test_math_utils.py
similarity index 100%
rename from tests/unit/utils/test_math_utils.py
rename to src/tests/unit/utils/test_math_utils.py
diff --git a/tests/unit/utils/test_network.py b/src/tests/unit/utils/test_network.py
similarity index 100%
rename from tests/unit/utils/test_network.py
rename to src/tests/unit/utils/test_network.py
diff --git a/tests/unit/utils/test_sqlite3_datetime.py b/src/tests/unit/utils/test_sqlite3_datetime.py
similarity index 100%
rename from tests/unit/utils/test_sqlite3_datetime.py
rename to src/tests/unit/utils/test_sqlite3_datetime.py