diff --git a/Makefile.meson b/Makefile.meson
index 326c051e..74cc710a 100644
--- a/Makefile.meson
+++ b/Makefile.meson
@@ -35,7 +35,7 @@ $(BUILDDIR):
 
 check: test
 
-test: $(BUILDDIR)
+test: all
 	@cd $(BUILDDIR); $(MESON) test
 
 test-valgrind: $(BUILDDIR)
diff --git a/lib/tests/meson.build b/lib/tests/meson.build
index ca428f6c..e5d4d02a 100644
--- a/lib/tests/meson.build
+++ b/lib/tests/meson.build
@@ -18,51 +18,51 @@
 # tests
 #
 
-test('test_maildir',
+test('test-maildir',
      executable('test-maildir',
 		'test-mu-maildir.cc',
 		install: false,
 		dependencies: [glib_dep, lib_mu_dep, lib_test_mu_common_dep]))
-test('test_msg_fields',
+test('test-msg-fields',
      executable('test-msg-fields',
 		'test-mu-msg-fields.cc',
 		install: false,
 		dependencies: [glib_dep, lib_mu_dep, lib_test_mu_common_dep]))
-test('test_msg',
+test('test-msg',
      executable('test-msg',
 		'test-mu-msg.cc',
 		install: false,
 		dependencies: [glib_dep, lib_mu_dep, lib_test_mu_common_dep]))
-test('test_store',
+test('test-store',
      executable('test-store',
 		'test-mu-store.cc',
 		install: false,
 		dependencies: [glib_dep, lib_mu_dep, lib_test_mu_common_dep]))
-test('test_query',
+test('test-query',
      executable('test-query',
 		'test-query.cc',
 		install: false,
 		dependencies: [glib_dep, lib_mu_dep, lib_test_mu_common_dep]))
 
-test('test_tokenizer',
+test('test-tokenizer',
      executable('test-tokenizer',
 		'test-tokenizer.cc',
 		install: false,
 		dependencies: [glib_dep, lib_mu_dep, lib_test_mu_common_dep]))
-test('test_threads',
+test('test-threads',
      executable('test-threads',
 		'../mu-query-threads.cc',
 		install: false,
 		cpp_args: ['-DBUILD_TESTS'],
 		dependencies: [glib_dep, lib_mu_dep, lib_test_mu_common_dep]))
-test('test_contacts-cache',
+test('test-contacts-cache',
      executable('test-contacts',
 		'../mu-contacts-cache.cc',
 		install: false,
 		cpp_args: ['-DBUILD_TESTS'],
 		dependencies: [glib_dep, lib_mu_dep, lib_test_mu_common_dep]))
 
-test('test_message_contact',
+test('test-message-contact',
      executable('test-message-contact',
 		'../mu-message-contact.cc',
 		install: false,
@@ -70,7 +70,7 @@ test('test_message_contact',
 		dependencies: [glib_dep, gmime_dep, lib_mu_dep,
                                lib_test_mu_common_dep]))
 
-test('test_parser',
+test('test-parser',
      executable('test-parser',
 		'test-parser.cc',
 		install: false,
diff --git a/mu/tests/meson.build b/mu/tests/meson.build
index c4380c78..63aa3fc4 100644
--- a/mu/tests/meson.build
+++ b/mu/tests/meson.build
@@ -17,17 +17,17 @@
 #
 # tests
 #
-test('test_cmd',
+test('test-cmd',
      executable('test-cmd',
 		'test-mu-cmd.cc',
 		install: false,
 		dependencies: [glib_dep, lib_test_mu_common_dep, config_h_dep, lib_mu_dep]))
-test('test_cmd_cfind',
+test('test-cmd-cfind',
      executable('test-cmd-cfind',
 		'test-mu-cmd-cfind.cc',
 		install: false,
 		dependencies: [glib_dep, lib_test_mu_common_dep, config_h_dep, lib_mu_dep]))
-test('test_cmd_query',
+test('test-cmd-query',
      executable('test-cmd-query',
 		'test-mu-query.cc',
 		install: false,