diff --git a/tests/core/Sconscript b/tests/core/Sconscript
index 8ef5fbb6..d2718e2e 100644
--- a/tests/core/Sconscript
+++ b/tests/core/Sconscript
@@ -24,7 +24,6 @@ res += [ CoreTest("idle",     "idle.cpp")     ]
 res += SConscript("tags/Sconscript")
 Return("res")
 
-#test(	"tags/artist"	)
 #test(	"tags/album"	)
 #test(	"tags/genre"	)
 #test(	"tags/library"	)
diff --git a/tests/core/tags/Sconscript b/tests/core/tags/Sconscript
index f3cf8134..ecfe783b 100644
--- a/tests/core/tags/Sconscript
+++ b/tests/core/tags/Sconscript
@@ -12,4 +12,5 @@ def TagTest(name, source):
 	return run
 
 res  = [ TagTest("generic", "generic.cpp") ]
+res += [ TagTest("artist",  "artist.cpp")  ]
 Return("res")
diff --git a/tests/core/tags/artist.cpp b/tests/core/tags/artist.cpp
index 26cf7e7f..c436a12f 100644
--- a/tests/core/tags/artist.cpp
+++ b/tests/core/tags/artist.cpp
@@ -2,7 +2,7 @@
  * Copyright 2014 (c) Anna Schumaker.
  */
 #include <core/tags/artist.h>
-#include <tests/test.h>
+#include "../test.h"
 
 static void test_artist_tag()
 {
@@ -34,9 +34,7 @@ static void test_artist_tag_lookup()
 	test_equal(artist_db.size(), (unsigned)1);
 }
 
-int main(int argc, char **argv)
-{
-	test :: run("Artist Tag Test", test_artist_tag);
-	test :: run("Artist Tag Lookup Test", test_artist_tag_lookup);
-	return 0;
-}
+DECLARE_UNIT_TESTS(
+	UNIT_TEST("Artist Tag", test_artist_tag),
+	UNIT_TEST("Artist Tag Lookup", test_artist_tag_lookup),
+);