diff --git a/src/osmo-nitb/bsc_hack.c b/src/osmo-nitb/bsc_hack.c
index 89bbb5e..21585e5 100644
--- a/src/osmo-nitb/bsc_hack.c
+++ b/src/osmo-nitb/bsc_hack.c
@@ -57,7 +57,7 @@
 
 /* MCC and MNC for the Location Area Identifier */
 struct gsm_network *bsc_gsmnet = 0;
-static const char *database_name = "hlr.sqlite3";
+static const char *database_name = "sms.db";
 static const char *config_file = "openbsc.cfg";
 static const char *rf_ctrl_path = NULL;
 extern const char *openbsc_copyright;
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b36844a..38890a8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -87,7 +87,7 @@
 if BUILD_SMPP
 	$(PYTHON) $(srcdir)/smpp_test_runner.py -w $(abs_top_builddir) -v
 endif
-	rm -f $(top_builddir)/hlr.sqlite3 $(top_builddir)/gsn_restart $(top_builddir)/gtphub_restart_count
+	rm -f $(top_builddir)/sms.db $(top_builddir)/gsn_restart $(top_builddir)/gtphub_restart_count
 else
 python-tests: $(BUILT_SOURCES)
 	echo "Not running python-based tests (determined at configure-time)"