diff --git a/stepmania/src/Grade.cpp b/stepmania/src/Grade.cpp
index 7feb88d560..4ec935d134 100644
--- a/stepmania/src/Grade.cpp
+++ b/stepmania/src/Grade.cpp
@@ -14,18 +14,6 @@
 #include "RageUtil.h"
 #include "ThemeManager.h"
 
-CString GradeToString( Grade g )
-{
-        // string is meant to be human readable
-        switch( g )
-        {
-        case GRADE_NO_DATA:     return "NoData";
-        case GRADE_FAILED:      return "Failed";
-        default:
-                return ssprintf("Tier%02d",g+1);
-        }
-}
-
 CString GradeToThemedString( Grade g )
 {
 	CString s = GradeToString(g);
diff --git a/stepmania/src/Grade.h b/stepmania/src/Grade.h
index 36f2fcfa66..3e38dd5bd3 100644
--- a/stepmania/src/Grade.h
+++ b/stepmania/src/Grade.h
@@ -43,7 +43,20 @@ enum Grade
 	GRADE_NO_DATA,	// ~GRADE_INVALID
 };
 
-CString GradeToString( Grade g );
+/* This is in the header so the test sets don't require Grade.cpp (through PrefsManager),
+ * since that pulls in ThemeManager. */
+static inline CString GradeToString( Grade g )
+{
+        // string is meant to be human readable
+        switch( g )
+        {
+        case GRADE_NO_DATA:     return "NoData";
+        case GRADE_FAILED:      return "Failed";
+        default:
+                return ssprintf("Tier%02d",g+1);
+        }
+}
+
 CString GradeToOldString( Grade g );	// "AAA", "B", etc for backward compatibility
 CString GradeToThemedString( Grade g );
 Grade StringToGrade( const CString &s );