diff --git a/Makefile b/Makefile
index 56d8a3df..9bf253bb 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ lint: style
 	python3 -m pylint --rcfile=pylint3.cfg \
 		--reports=no \
 		--ignore=assets.py \
-		lobster util tests-system/lobster-trlc/run_tool_tests.py
+		lobster util tests-system/run_tool_tests.py
 
 style:
 	@python3 -m pycodestyle lobster \
diff --git a/tests-system/lobster-trlc/Makefile b/tests-system/lobster-trlc/Makefile
index 243eecff..54a7a3fc 100644
--- a/tests-system/lobster-trlc/Makefile
+++ b/tests-system/lobster-trlc/Makefile
@@ -1,5 +1,4 @@
 PYTHON = python
 
 lobster-trlc-system-tests:
-	@echo "Running lobster-trlc system tests..."
-	@$(PYTHON) run_tool_tests.py
+	@$(PYTHON) ../run_tool_tests.py .
diff --git a/tests-system/lobster-trlc/run_tool_tests.py b/tests-system/run_tool_tests.py
similarity index 97%
rename from tests-system/lobster-trlc/run_tool_tests.py
rename to tests-system/run_tool_tests.py
index fb525e8b..1d1cf843 100644
--- a/tests-system/lobster-trlc/run_tool_tests.py
+++ b/tests-system/run_tool_tests.py
@@ -184,12 +184,14 @@ def _run_tests(directory: str, tool: str) -> int:
     if not tool:
         raise ValueError("No tool specified!")
 
+    counter = 0
     for rbt_dir_entry in _get_directories(directory, REQUIREMENTS_BASED_TEST_PREFIX):
         for test_case_dir_entry in _get_directories(rbt_dir_entry.path):
             test_setup = TestSetup(test_case_dir_entry.path)
             completed_process = _run_test(test_setup, tool)
             _compare_results(test_setup, completed_process)
-    print(f"All system tests finished successfully for {tool}.")
+            counter += 1
+    print(f"{counter} system tests finished successfully for {tool}.")
 
     # TODO: the current implementation is not consistent with respect to return codes.
     # The tests use assertion statements to indicate failures, but here we use an
@@ -212,7 +214,9 @@ def _get_tool(test_dir: str) -> str:
 
 
 if __name__ == "__main__":
-    test_directory = dirname(Path(__file__).resolve())
+    test_directory = Path(sys.argv[1]).resolve()
+    print(f"Starting system tests on folder '{test_directory}'")
+
     sys.exit(
         _run_tests(
             test_directory,