diff --git a/tests/python_bindings/CMakeLists.txt b/tests/python_bindings/CMakeLists.txt
index a3abfac..559df74 100644
--- a/tests/python_bindings/CMakeLists.txt
+++ b/tests/python_bindings/CMakeLists.txt
@@ -4,14 +4,14 @@ target_link_libraries(test_suite juci_shared ${PYTHON_LIBRARIES})
 
 include_directories(${CMAKE_SOURCE_DIR}/tests/python_bindings)
 
-add_executable(pb_python_interpreter_test PythonInterpreter_tests/interpreter_test.cc $<TARGET_OBJECTS:test_stubs>)
-target_link_libraries(pb_python_interpreter_test juci_shared test_suite)
-add_test(pb_python_interpreter_test pb_python_interpreter_test)
+add_executable(pb_python_module_test PythonModule_tests/python_module_test.cc $<TARGET_OBJECTS:test_stubs>)
+target_link_libraries(pb_python_module_test test_suite)
+add_test(pb_python_module_test pb_python_module_test)
 
 add_executable(pb_cmake_test CMake_tests/cmake_test.cc $<TARGET_OBJECTS:test_stubs>)
-target_link_libraries(pb_cmake_test juci_shared test_suite)
+target_link_libraries(pb_cmake_test test_suite)
 add_test(pb_cmake_test pb_cmake_test)
 
 add_executable(pb_terminal_test Terminal_tests/terminal_test.cc $<TARGET_OBJECTS:test_stubs>)
-target_link_libraries(pb_terminal_test juci_shared test_suite)
+target_link_libraries(pb_terminal_test test_suite)
 add_test(pb_terminal_test pb_terminal_test)
diff --git a/tests/python_interpreter_test_files/exception_test.py b/tests/python_bindings/PythonModule_tests/exception_test.py
similarity index 100%
rename from tests/python_interpreter_test_files/exception_test.py
rename to tests/python_bindings/PythonModule_tests/exception_test.py
diff --git a/tests/python_bindings/PythonInterpreter_tests/interpreter_test.cc b/tests/python_bindings/PythonModule_tests/python_module_test.cc
similarity index 69%
rename from tests/python_bindings/PythonInterpreter_tests/interpreter_test.cc
rename to tests/python_bindings/PythonModule_tests/python_module_test.cc
index 2ef7681..b50d4b7 100644
--- a/tests/python_bindings/PythonInterpreter_tests/interpreter_test.cc
+++ b/tests/python_bindings/PythonModule_tests/python_module_test.cc
@@ -3,14 +3,14 @@
 
 int main() {
   {
-    suite test_suite("PythonInterpreter_tests");
+    suite test_suite("PythonModule_tests");
     {
-      py::module::import("interpreter_test");
+      py::module::import("python_module_test");
       test_suite.has_assertion = true;
     }
   }
   {
-    suite test_suite("PythonInterpreter_tests");
+    suite test_suite("PythonModule_tests");
     {
       try {
         py::module::import("exception_test");
diff --git a/tests/python_bindings/PythonInterpreter_tests/interpreter_test.py b/tests/python_bindings/PythonModule_tests/python_module_test.py
similarity index 100%
rename from tests/python_bindings/PythonInterpreter_tests/interpreter_test.py
rename to tests/python_bindings/PythonModule_tests/python_module_test.py