diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am
index c9dbfa3c48..4387df5853 100644
--- a/src/frontends/Makefile.am
+++ b/src/frontends/Makefile.am
@@ -39,3 +39,23 @@ liblyxfrontends_la_SOURCES = \
 	WorkAreaManager.cpp \
 	WorkAreaManager.h \
 	mouse_state.h
+
+################################# Tests ################################
+
+EXTRA_DIST += tests/test_biblio
+
+TESTS = \
+	test_biblio
+
+check_PROGRAMS = \
+	biblio
+
+biblio_LDADD = $(BOOST_REGEX)
+biblio_SOURCES = \
+	tests/biblio.cpp \
+	tests/boost.cpp
+
+makeregfiles: ${check_PROGRAMS}
+	for all in ${check_PROGRAMS} ; do \
+		./$$all > ${srcdir}/regfiles/$$all ; \
+	done
diff --git a/src/frontends/controllers/Makefile.am b/src/frontends/controllers/Makefile.am
index e2274e2941..b6f82d0e65 100644
--- a/src/frontends/controllers/Makefile.am
+++ b/src/frontends/controllers/Makefile.am
@@ -42,24 +42,3 @@ AM_CPPFLAGS += $(PCH_FLAGS)
 liblyxcontrollers_la_SOURCES = $(SOURCEFILES) $(HEADERFILES)
 
 endif
-
-
-################################# Tests ################################
-
-EXTRA_DIST += tests/test_biblio
-
-TESTS = \
-	test_biblio
-
-check_PROGRAMS = \
-	biblio
-
-biblio_LDADD = $(BOOST_REGEX)
-biblio_SOURCES = \
-	tests/biblio.cpp \
-	tests/boost.cpp
-
-makeregfiles: ${check_PROGRAMS}
-	for all in ${check_PROGRAMS} ; do \
-		./$$all > ${srcdir}/regfiles/$$all ; \
-	done
diff --git a/src/frontends/controllers/tests/biblio.cpp b/src/frontends/tests/biblio.cpp
similarity index 100%
rename from src/frontends/controllers/tests/biblio.cpp
rename to src/frontends/tests/biblio.cpp
diff --git a/src/frontends/controllers/tests/boost.cpp b/src/frontends/tests/boost.cpp
similarity index 100%
rename from src/frontends/controllers/tests/boost.cpp
rename to src/frontends/tests/boost.cpp
diff --git a/src/frontends/controllers/tests/regfiles/biblio b/src/frontends/tests/regfiles/biblio
similarity index 100%
rename from src/frontends/controllers/tests/regfiles/biblio
rename to src/frontends/tests/regfiles/biblio
diff --git a/src/frontends/controllers/tests/test_biblio b/src/frontends/tests/test_biblio
similarity index 100%
rename from src/frontends/controllers/tests/test_biblio
rename to src/frontends/tests/test_biblio