diff --git a/.gitignore b/.gitignore
index 70c0b42..b1879a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,12 +60,12 @@ test/sdptest
 test/lmptest
 test/ipctest
 test/btiotest
-test/test-textfile
 test/mpris-player
 test/sap_client.pyc
 test/bluezutils.pyc
 unit/test-eir
 unit/test-uuid
+unit/test-textfile
 tools/btattach
 tools/btmgmt
 tools/btsnoop
diff --git a/Makefile.am b/Makefile.am
index d4a5601..5e0a5be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -219,7 +219,7 @@ AM_CPPFLAGS = -I$(builddir)/lib -I$(builddir)/src -I$(srcdir)/src \
 			-I$(srcdir)/gdbus -I$(srcdir)/btio
 
 
-unit_tests = unit/test-eir unit/test-uuid
+unit_tests = unit/test-eir unit/test-uuid unit/test-textfile
 
 unit_test_eir_SOURCES = unit/test-eir.c src/eir.c src/glib-helper.c
 unit_test_eir_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@
@@ -227,6 +227,9 @@ unit_test_eir_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@
 unit_test_uuid_SOURCES = unit/test-uuid.c
 unit_test_uuid_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@
 
+unit_test_textfile_SOURCES = unit/test-textfile.c src/textfile.h src/textfile.c
+unit_test_textfile_LDADD = @GLIB_LIBS@
+
 unit_tests += unit/test-gobex-header unit/test-gobex-packet unit/test-gobex \
 			unit/test-gobex-transfer unit/test-gobex-apparam
 
diff --git a/Makefile.tools b/Makefile.tools
index 9f6bc5a..764f48c 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -146,8 +146,7 @@ bin_PROGRAMS += test/hciemu test/l2test test/rctest
 
 noinst_PROGRAMS += test/gaptest test/sdptest test/scotest test/avtest \
 					test/lmptest test/bdaddr test/agent \
-					test/btiotest test/test-textfile \
-					test/mpris-player
+					test/btiotest test/mpris-player
 
 test_hciemu_LDADD = lib/libbluetooth-private.la
 
@@ -176,8 +175,6 @@ test_btiotest_LDADD = @GLIB_LIBS@ lib/libbluetooth-private.la
 test_mpris_player_SOURCES = test/mpris-player.c
 test_mpris_player_LDADD = @DBUS_LIBS@ @GLIB_LIBS@
 
-test_test_textfile_SOURCES = test/test-textfile.c src/textfile.h src/textfile.c
-
 dist_man_MANS += test/rctest.1 test/hciemu.1
 
 EXTRA_DIST += test/bdaddr.1
diff --git a/test/test-textfile.c b/unit/test-textfile.c
similarity index 100%
rename from test/test-textfile.c
rename to unit/test-textfile.c