diff --git a/tests/core/tags/artist.c b/tests/core/tags/artist.c
index 53b6f9a6..265bee21 100644
--- a/tests/core/tags/artist.c
+++ b/tests/core/tags/artist.c
@@ -107,19 +107,14 @@ static void test_artist_db()
 	g_assert_cmpuint(artist_db.db_size, ==, 1);
 
 	db_deinit(&artist_db);
+	artist_db_deinit();
 }
 
 int main(int argc, char **argv)
 {
-	int ret;
-
-	artist_db_init();
 	g_test_init(&argc, &argv, NULL);
 	g_test_add_func("/Core/Tags/Artist", test_artist);
 	g_test_add_func("/Core/Tags/Artist/Comparison", test_artist_compare);
 	g_test_add_func("/Core/Tags/Artist/Database", test_artist_db);
-	ret = g_test_run();
-
-	artist_db_deinit();
-	return ret;
+	return g_test_run();
 }
diff --git a/tests/core/tags/library.c b/tests/core/tags/library.c
index 26324233..941ce329 100644
--- a/tests/core/tags/library.c
+++ b/tests/core/tags/library.c
@@ -98,18 +98,13 @@ static void test_library_db()
 	db_load(&library_db);
 	g_assert_cmpuint(library_db.db_size, ==, 0);
 	g_ptr_array_free(library_db.db_entries, true);
+	library_db_deinit();
 }
 
 int main(int argc, char **argv)
 {
-	int ret;
-
-	library_db_init();
 	g_test_init(&argc, &argv, NULL);
 	g_test_add_func("/Core/Tags/Library", test_library);
 	g_test_add_func("/Core/Tags/Library/Database", test_library_db);
-	ret = g_test_run();
-
-	library_db_deinit();
-	return ret;
+	return g_test_run();
 }