diff --git a/src/test/java/org/bukkit/PerMaterialTest.java b/src/test/java/org/bukkit/PerMaterialTest.java
index f689cbf403..1b532e1493 100644
--- a/src/test/java/org/bukkit/PerMaterialTest.java
+++ b/src/test/java/org/bukkit/PerMaterialTest.java
@@ -41,10 +41,6 @@ public class PerMaterialTest extends AbstractTestingBase {
     public static List<Object[]> data() {
         List<Object[]> list = Lists.newArrayList();
         for (Material material : Material.values()) {
-            if (INVALIDATED_MATERIALS.contains(material)) {
-                continue;
-            }
-
             list.add(new Object[] {material});
         }
         return list;
@@ -75,6 +71,8 @@ public class PerMaterialTest extends AbstractTestingBase {
 
     @Test
     public void maxDurability() {
+        if (INVALIDATED_MATERIALS.contains(material)) return;
+
         if (material == Material.AIR) {
             assertThat((int) material.getMaxDurability(), is(0));
         } else if (material.isBlock()){
@@ -85,6 +83,8 @@ public class PerMaterialTest extends AbstractTestingBase {
 
     @Test
     public void maxStackSize() {
+        if (INVALIDATED_MATERIALS.contains(material)) return;
+
         final ItemStack bukkit = new ItemStack(material);
         final CraftItemStack craft = CraftItemStack.asCraftCopy(bukkit);
         if (material == Material.AIR) {