diff --git a/tests/core/Sconscript b/tests/core/Sconscript
index 2dfcabc3..4ac3e7b1 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/library"	)
 #test(	"tags/track"	)
 #
 #test(	"random"	)
diff --git a/tests/core/tags/Sconscript b/tests/core/tags/Sconscript
index b22b09b2..fa075a24 100644
--- a/tests/core/tags/Sconscript
+++ b/tests/core/tags/Sconscript
@@ -15,4 +15,5 @@ res  = [ TagTest("generic", "generic.cpp") ]
 res += [ TagTest("artist",  "artist.cpp")  ]
 res += [ TagTest("album",   "album.cpp")   ]
 res += [ TagTest("genre",   "genre.cpp")   ]
+res += [ TagTest("library", "library.cpp") ]
 Return("res")
diff --git a/tests/core/tags/library.cpp b/tests/core/tags/library.cpp
index 223e4a76..028150ee 100644
--- a/tests/core/tags/library.cpp
+++ b/tests/core/tags/library.cpp
@@ -2,7 +2,7 @@
  * Copyright 2014 (c) Anna Schumaker.
  */
 #include <core/tags/library.h>
-#include <tests/test.h>
+#include "../test.h"
 
 static void test_library_tag()
 {
@@ -65,9 +65,7 @@ static void test_library_tag_lookup()
 	test_equal(tags :: library_size(), (unsigned)1);
 }
 
-int main(int argc, char **argv)
-{
-	test :: run("Library Tag Test", test_library_tag);
-	test :: run("Library Tag Lookup Test", test_library_tag_lookup);
-	return 0;
-}
+DECLARE_UNIT_TESTS(
+	UNIT_TEST("Library Tag", test_library_tag),
+	UNIT_TEST("Library Tag Lookup", test_library_tag_lookup),
+);