diff --git a/test/test-automation/SDL_test.h b/test/test-automation/SDL_test.h
index b61fc2d66..f2e387e50 100644
--- a/test/test-automation/SDL_test.h
+++ b/test/test-automation/SDL_test.h
@@ -35,10 +35,16 @@ extern int _testAssertsPassed;
  * Holds information about a test case
  */
 typedef struct TestCaseReference {
-	char *name;         /*!< "Func2Stress" */
-	char *description;  /*!< "This test beats the crap out of func2()" */
-	int enabled;       /*!< Set to TEST_ENABLED or TEST_DISABLED */
-	long requirements;  /*!< Set to TEST_REQUIRES_OPENGL, TEST_REQUIRES_AUDIO, ... */
+	/*!< "Func2Stress" */
+	char *name;
+	/*!< "This test beats the crap out of func2()" */
+	char *description;
+	/*!< Set to TEST_ENABLED or TEST_DISABLED */
+	int enabled;
+	/*!< Set to TEST_REQUIRES_OPENGL, TEST_REQUIRES_AUDIO, ... */
+	long requirements;
+	/*<! Timeout value in seconds. If exceeded runner will kill the test. 0 means infinite time */
+	long timeout;
 } TestCaseReference;
 
 /*! \fn _TestCaseInit
diff --git a/test/test-automation/testdummy/testdummy.c b/test/test-automation/testdummy/testdummy.c
index f69ab148c..31ec9f376 100644
--- a/test/test-automation/testdummy/testdummy.c
+++ b/test/test-automation/testdummy/testdummy.c
@@ -37,13 +37,13 @@
 
 /* Test case references */
 static const TestCaseReference test1 =
-		(TestCaseReference){ "dummycase1", "description", TEST_ENABLED, 0 };
+		(TestCaseReference){ "dummycase1", "description", TEST_ENABLED, 0, 0};
 
 static const TestCaseReference test2 =
-		(TestCaseReference){ "dummycase2", "description", TEST_ENABLED, 0 };
+		(TestCaseReference){ "dummycase2", "description", TEST_ENABLED, 0, 0};
 
 static const TestCaseReference test3 =
-		(TestCaseReference){ "dummycase3", "description", TEST_ENABLED, 0 };
+		(TestCaseReference){ "dummycase3", "description", TEST_ENABLED, 0, 0};
 
 /* Test suite */
 extern const TestCaseReference *testSuite[] =  {
diff --git a/test/test-automation/testrect/testrect.c b/test/test-automation/testrect/testrect.c
index 5a2d443cd..dcd48b1ca 100644
--- a/test/test-automation/testrect/testrect.c
+++ b/test/test-automation/testrect/testrect.c
@@ -10,7 +10,7 @@
 
 /* Test cases */
 static const TestCaseReference test1 =
-		(TestCaseReference){ "rect_testIntersectRectAndLine", "description", TEST_ENABLED, 0 };
+		(TestCaseReference){ "rect_testIntersectRectAndLine", "description", TEST_ENABLED, 0, 0 };
 
 /* Test suite */
 extern const TestCaseReference *testSuite[] =  {