diff --git a/test/test-automation/Makefile.am b/test/test-automation/Makefile.am
index 666f8404a..f12015ba9 100644
--- a/test/test-automation/Makefile.am
+++ b/test/test-automation/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I acinclude -I build-scripts
 SUBDIRS = tests
 
 bin_PROGRAMS = runner
-runner_SOURCES = runner.c tests/SDL_test.c
+runner_SOURCES = runner.c SDL_test.c
 runner_CLAGS = -W -Wall -Wextra -g `sdl-config --cflags` -DSDL_NO_COMPAT
 runner_LDFLAGS = `sdl-config --libs`
 
@@ -12,4 +12,7 @@ install-tests:
 	-cp -f tests/.libs/*.dylib tests/ 2> /dev/null
 	-cp -f tests/.libs/*.so tests/ 2> /dev/null
 
+distclean-local:
+	-rm -Rf docs/
+
 
diff --git a/test/test-automation/tests/SDL_test.c b/test/test-automation/SDL_test.c
similarity index 100%
rename from test/test-automation/tests/SDL_test.c
rename to test/test-automation/SDL_test.c
diff --git a/test/test-automation/tests/SDL_test.h b/test/test-automation/SDL_test.h
similarity index 100%
rename from test/test-automation/tests/SDL_test.h
rename to test/test-automation/SDL_test.h
diff --git a/test/test-automation/runner.c b/test/test-automation/runner.c
index 1bb66a0e4..46150887a 100644
--- a/test/test-automation/runner.c
+++ b/test/test-automation/runner.c
@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include "tests/SDL_test.h"
+#include "SDL_test.h"
 
 //!< Function pointer to a test case function
 typedef int (*TestCase)(void *arg);
diff --git a/test/test-automation/tests/Makefile.am b/test/test-automation/tests/Makefile.am
index 0b62713ef..bbbe14f1b 100644
--- a/test/test-automation/tests/Makefile.am
+++ b/test/test-automation/tests/Makefile.am
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libtest.la
-libtest_la_SOURCES = test.c SDL_test.c
+libtest_la_SOURCES = test.c ../SDL_test.c
 libtest_la_CLAGS = -fPIC -g
 libtest_la_LDFLAGS = `sdl-config --libs`
 
diff --git a/test/test-automation/tests/test.c b/test/test-automation/tests/test.c
index 3e9ee3626..a754a45e6 100644
--- a/test/test-automation/tests/test.c
+++ b/test/test-automation/tests/test.c
@@ -25,7 +25,7 @@
 
 #include <SDL/SDL.h>
 
-#include "SDL_test.h"
+#include "../SDL_test.h"
 
 /* Test cases */
 static const TestCaseReference test1 =