diff --git a/configure.in b/configure.in
index e3e8a3b89..045d7350e 100644
--- a/configure.in
+++ b/configure.in
@@ -25,4 +25,5 @@ AC_OUTPUT(
     tests/timer/Makefile
     tests/sms/Makefile
     tests/gsm0408/Makefile
+    tests/db/Makefile
     Makefile)
diff --git a/src/Makefile.am b/src/Makefile.am
index 856293798..62afff2e4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,12 +1,9 @@
 INCLUDES = $(all_includes) -I$(top_srcdir)/include
 AM_CFLAGS=-Wall
 
-sbin_PROGRAMS = bsc_hack db_test
+sbin_PROGRAMS = bsc_hack
 
 bsc_hack_SOURCES = bsc_hack.c misdn.c abis_rsl.c abis_nm.c gsm_04_08.c gsm_data.c \
 		gsm_subscriber.c msgb.c select.c chan_alloc.c timer.c debug.c db.c \
 		gsm_04_11.c
 bsc_hack_LDADD = -ldl -ldbi
-
-db_test_SOURCES = db_test.c db.c
-db_test_LDADD = -ldl -ldbi
diff --git a/tests/Makefile.am b/tests/Makefile.am
index fbfc827a7..2b72c9c11 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1 +1 @@
-SUBDIRS = debug timer sms gsm0408
+SUBDIRS = debug timer sms gsm0408 db
diff --git a/tests/db/Makefile.am b/tests/db/Makefile.am
new file mode 100644
index 000000000..936263b7e
--- /dev/null
+++ b/tests/db/Makefile.am
@@ -0,0 +1,8 @@
+INCLUDES = $(all_includes) -I$(top_srcdir)/include
+AM_CFLAGS=-Wall
+
+noinst_PROGRAMS = db_test
+
+db_test_SOURCES = db_test.c $(top_srcdir)/src/db.c
+db_test_LDADD = -ldl -ldbi
+
diff --git a/src/db_test.c b/tests/db/db_test.c
similarity index 100%
rename from src/db_test.c
rename to tests/db/db_test.c