diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 9ba417f9f..4e78f18b5 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -69,10 +69,6 @@ jobs:
       - name: Install Testrun
         shell: bash {0}
         run: cmd/install -l
-      - name: Build Testrun
-        shell: bash {0}
-        run: cmd/build
-        timeout-minutes: 10
       - name: Run tests for conn module
         shell: bash {0}
         run: bash testing/unit/run_test_module.sh conn captures ethtool output
diff --git a/framework/python/src/test_orc/test_orchestrator.py b/framework/python/src/test_orc/test_orchestrator.py
index 550ff3b39..d28326cbc 100644
--- a/framework/python/src/test_orc/test_orchestrator.py
+++ b/framework/python/src/test_orc/test_orchestrator.py
@@ -531,6 +531,20 @@ def _run_test_module(self, module):
       if time.time() > test_module_timeout:
         LOGGER.error("Module timeout exceeded, killing module: " + module.name)
         module.stop(kill=True)
+
+        # Update the test description for the tests
+        for test in module.tests:
+
+          # Copy the test so we don't alter the source
+          test_copy = copy.deepcopy(test)
+
+          # Update test
+          test_copy.result = TestResult.ERROR
+          test_copy.description = (
+            "Module timeout exceeded. Try increasing the timeout value."
+          )
+          self.get_session().add_test_result(test_copy)
+
         break
 
     # Save all container logs to file