diff --git a/src/test/java/net/onrc/onos/api/newintent/IntentServiceTest.java b/src/test/java/net/onrc/onos/api/newintent/IntentServiceTest.java
index 5fce2b6..852ef68 100644
--- a/src/test/java/net/onrc/onos/api/newintent/IntentServiceTest.java
+++ b/src/test/java/net/onrc/onos/api/newintent/IntentServiceTest.java
@@ -1,5 +1,7 @@
 package net.onrc.onos.api.newintent;
 
+import net.onrc.onos.core.newintent.TestIntent;
+import net.onrc.onos.core.newintent.TestSubclassIntent;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -256,18 +258,6 @@
         }
     }
 
-    private class TestIntent extends AbstractIntent implements InstallableIntent {
-        TestIntent(IntentId id) {
-            super(id);
-        }
-    }
-
-    private class TestSubclassIntent extends TestIntent {
-        TestSubclassIntent(IntentId id) {
-            super(id);
-        }
-    }
-
     // Controllable compiler
     private class TestCompiler implements IntentCompiler<TestIntent> {
         private final boolean fail;