diff --git a/jOOQ-test/.classpath b/jOOQ-test/.classpath
index cb54f65012..d07fb81a34 100644
--- a/jOOQ-test/.classpath
+++ b/jOOQ-test/.classpath
@@ -25,6 +25,5 @@
 	<classpathentry exported="true" kind="lib" path="lib/jtds-1.2.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/iijdbc.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/h2-1.3.163.jar" sourcepath="/jOOQ-sources/h2-1.3.163-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/joor-0.9.1.jar" sourcepath="C:/Users/lukas/.m2/repository/org/jooq/joor/0.9.1/joor-0.9.1-sources.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/jOOQ-test/lib/joor-0.9.1.jar b/jOOQ-test/lib/joor-0.9.1.jar
deleted file mode 100644
index 081a3c4627..0000000000
Binary files a/jOOQ-test/lib/joor-0.9.1.jar and /dev/null differ
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java
index aa90b22925..b2ad907652 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java
@@ -43,7 +43,7 @@ import static junit.framework.Assert.assertTrue;
 import static junit.framework.Assert.fail;
 import static org.jooq.impl.Factory.count;
 import static org.jooq.impl.Factory.val;
-import static org.joor.Reflect.on;
+import static org.jooq.tools.reflect.Reflect.on;
 
 import java.sql.Date;
 import java.sql.ResultSet;
@@ -83,9 +83,9 @@ import org.jooq.test._.FinalWithAnnotations;
 import org.jooq.test._.FinalWithoutAnnotations;
 import org.jooq.test._.StaticWithAnnotations;
 import org.jooq.test._.StaticWithoutAnnotations;
+import org.jooq.tools.reflect.Reflect;
+import org.jooq.tools.reflect.ReflectException;
 
-import org.joor.Reflect;
-import org.joor.ReflectException;
 import org.junit.Test;
 
 public class FetchTests<