diff --git a/.gitignore b/.gitignore
index 9f4d606a9..dbe9b2751 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,4 @@ test/dump_rva2
 test/dump_text_file
 test/test_byte_reverse
 test/test_vorbis_encoder
+test/DumpDatabase
diff --git a/Makefile.am b/Makefile.am
index 469aa129f..cc4c8b9ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -999,7 +999,7 @@ if ENABLE_TEST
 C_TESTS = \
 	test/test_byte_reverse \
 	test/test_pcm \
-	test/TestQueuePriority
+	test/test_queue_priority
 
 TESTS = $(C_TESTS)
 
@@ -1311,12 +1311,12 @@ TESTS += test/test_archive_iso9660.sh
 endif
 
 if ENABLE_INOTIFY
-noinst_PROGRAMS += test/RunInotify
-test_RunInotify_SOURCES = test/RunInotify.c \
+noinst_PROGRAMS += test/run_inotify
+test_run_inotify_SOURCES = test/run_inotify.cxx \
 	src/fd_util.c \
 	src/fifo_buffer.c \
 	src/InotifySource.cxx
-test_RunInotify_LDADD = $(GLIB_LIBS)
+test_run_inotify_LDADD = $(GLIB_LIBS)
 endif
 
 test_test_byte_reverse_SOURCES = \
@@ -1337,11 +1337,11 @@ test_test_pcm_LDADD = \
 	libutil.a \
 	$(GLIB_LIBS)
 
-test_TestQueuePriority_SOURCES = \
+test_test_queue_priority_SOURCES = \
 	src/Queue.cxx \
 	src/fd_util.c \
-	test/TestQueuePriority.cxx
-test_TestQueuePriority_LDADD = \
+	test/test_queue_priority.cxx
+test_test_queue_priority_LDADD = \
 	libutil.a \
 	$(GLIB_LIBS)
 
diff --git a/test/RunInotify.cxx b/test/run_inotify.cxx
similarity index 100%
rename from test/RunInotify.cxx
rename to test/run_inotify.cxx
diff --git a/test/TestQueuePriority.cxx b/test/test_queue_priority.cxx
similarity index 100%
rename from test/TestQueuePriority.cxx
rename to test/test_queue_priority.cxx