diff --git a/exercises/build.gradle b/exercises/build.gradle
index 8f4b5c772..ef371bb6c 100644
--- a/exercises/build.gradle
+++ b/exercises/build.gradle
@@ -19,4 +19,11 @@ subprojects { project ->
       println "  (source = " + compileTask.source.asPath + ")"
     }
   }
+
+  task fullTest(type: Test) {
+    group = LifecycleBasePlugin.VERIFICATION_GROUP
+    description = "Runs tests without exclusions."
+  }
+
+  check.dependsOn(fullTest)
 }
diff --git a/exercises/grade-school/build.gradle b/exercises/grade-school/build.gradle
index 63e0ab503..d19152c82 100644
--- a/exercises/grade-school/build.gradle
+++ b/exercises/grade-school/build.gradle
@@ -11,3 +11,8 @@ dependencies {
   testCompile "org.assertj:assertj-core:3.2.0"
 }
 
+test {
+    useJUnit {
+        excludeCategories 'io.exercism.xjava.NotReady'
+    }
+}
diff --git a/exercises/grade-school/src/example/java/io/exercism/xjava/NotReady.java b/exercises/grade-school/src/example/java/io/exercism/xjava/NotReady.java
new file mode 100644
index 000000000..68d01566d
--- /dev/null
+++ b/exercises/grade-school/src/example/java/io/exercism/xjava/NotReady.java
@@ -0,0 +1,8 @@
+package io.exercism.xjava;
+
+/**
+ * Marker interface used to exclude tests as you work
+ * through each exercise.
+ */
+public interface NotReady {
+}
diff --git a/exercises/grade-school/src/test/java/SchoolTest.java b/exercises/grade-school/src/test/java/SchoolTest.java
index c1da9dd64..4bd17731c 100644
--- a/exercises/grade-school/src/test/java/SchoolTest.java
+++ b/exercises/grade-school/src/test/java/SchoolTest.java
@@ -1,5 +1,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
+import io.exercism.xjava.NotReady;
+import org.junit.experimental.categories.Category;
 import org.junit.Test;
 
 import java.util.Arrays;
@@ -16,12 +18,14 @@ public void startsWithNoStudents() {
   }
 
   @Test
+  @Category(NotReady.class)
   public void addsStudents() {
     school.add("Aimee", 2);
     assertThat(school.db().get(2)).contains("Aimee");
   }
 
   @Test
+  @Category(NotReady.class)
   public void addsMoreStudentsInSameGrade() {
     final int grade = 2;
     school.add("James", grade);
@@ -32,6 +36,7 @@ public void addsMoreStudentsInSameGrade() {
   }
 
   @Test
+  @Category(NotReady.class)
   public void addsStudentsInMultipleGrades() {
     school.add("Chelsea", 3);
     school.add("Logan", 7);
@@ -42,6 +47,7 @@ public void addsStudentsInMultipleGrades() {
   }
 
   @Test
+  @Category(NotReady.class)
   public void getsStudentsInAGrade() {
     school.add("Franklin", 5);
     school.add("Bradley", 5);
@@ -50,11 +56,13 @@ public void getsStudentsInAGrade() {
   }
 
   @Test
+  @Category(NotReady.class)
   public void getsStudentsInEmptyGrade() {
     assertThat(school.grade(1)).isEmpty();
   }
 
   @Test
+  @Category(NotReady.class)
   public void sortsSchool() {
     school.add("Jennifer", 4);
     school.add("Kareem", 6);