diff --git a/src/test/java/de/ailis/usb4java/TCKRunner.java b/src/test/java/de/ailis/usb4java/TCKRunner.java
new file mode 100644
index 0000000..7c487b0
--- /dev/null
+++ b/src/test/java/de/ailis/usb4java/TCKRunner.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2013 Klaus Reimer <k@ailis.de>
+ * See LICENSE.md for licensing information.
+ */
+
+package de.ailis.usb4java;
+
+import org.junit.internal.runners.JUnit38ClassRunner;
+import org.junit.runner.Description;
+import org.junit.runner.manipulation.Filter;
+import org.junit.runner.manipulation.NoTestsRemainException;
+
+/**
+ * Runner for TCK tests. TCK tests are only run when the property TCK_TESTS
+ * is set.
+ * 
+ * @author Klaus Reimer (k@ailis.de)
+ */
+public class TCKRunner extends JUnit38ClassRunner
+{
+    /**
+     * Constructor.
+     * 
+     * @param testClass
+     *            The test class.
+     * @throws NoTestsRemainException
+     *             When no tests are to be run in this test class.
+     */
+    public TCKRunner(final Class<?> testClass) throws NoTestsRemainException
+    {
+        super(testClass);
+        filter(new Filter()
+        {
+            @Override
+            public boolean shouldRun(Description description)
+            {
+                return System.getProperty("TCK_TESTS") != null;
+            }
+
+            @Override
+            public String describe()
+            {
+                return "TCK tests only when enabled";
+            }
+        });
+    }
+}
diff --git a/src/test/java/javax/usb/tck/DefaultControlPipeTestIRP.java b/src/test/java/javax/usb/tck/DefaultControlPipeTestIRP.java
index cd95fcd..e7c79d2 100755
--- a/src/test/java/javax/usb/tck/DefaultControlPipeTestIRP.java
+++ b/src/test/java/javax/usb/tck/DefaultControlPipeTestIRP.java
@@ -23,6 +23,10 @@ import java.util.*;
 import javax.usb.*;
 import javax.usb.event.*;
 
+import org.junit.runner.RunWith;
+
+import de.ailis.usb4java.TCKRunner;
+
 import junit.framework.TestCase;
 
 /**
@@ -37,6 +41,7 @@ import junit.framework.TestCase;
 
 
 @SuppressWarnings("all")
+@RunWith(TCKRunner.class)
 public class DefaultControlPipeTestIRP extends TestCase
 {
     public void setUp() throws Exception
diff --git a/src/test/java/javax/usb/tck/HotPlugTest.java b/src/test/java/javax/usb/tck/HotPlugTest.java
index fa8cc99..813122c 100755
--- a/src/test/java/javax/usb/tck/HotPlugTest.java
+++ b/src/test/java/javax/usb/tck/HotPlugTest.java
@@ -27,6 +27,10 @@ import javax.usb.*;
 import javax.usb.event.*;
 import javax.usb.util.StandardRequest;
 
+import org.junit.runner.RunWith;
+
+import de.ailis.usb4java.TCKRunner;
+
 import junit.framework.TestCase;
 
 /**
@@ -39,6 +43,7 @@ import junit.framework.TestCase;
 
 
 @SuppressWarnings("all")
+@RunWith(TCKRunner.class)
 public class HotPlugTest extends TestCase
 {
 
diff --git a/src/test/java/javax/usb/tck/IrpTest.java b/src/test/java/javax/usb/tck/IrpTest.java
index 4fbfd8a..b090ca4 100755
--- a/src/test/java/javax/usb/tck/IrpTest.java
+++ b/src/test/java/javax/usb/tck/IrpTest.java
@@ -4,6 +4,11 @@ import javax.usb.*;
 import junit.framework.TestCase;
 import junit.framework.Assert;
 import javax.usb.util.*;
+
+import org.junit.runner.RunWith;
+
+import de.ailis.usb4java.TCKRunner;
+
 import java.util.*;
  
 /**
@@ -37,6 +42,7 @@ import java.util.*;
  
  
 @SuppressWarnings("all")
+@RunWith(TCKRunner.class)
 public class IrpTest extends TestCase
 {
  
diff --git a/src/test/java/javax/usb/tck/SignatureTest.java b/src/test/java/javax/usb/tck/SignatureTest.java
index 1440ef2..b1f8f6f 100755
--- a/src/test/java/javax/usb/tck/SignatureTest.java
+++ b/src/test/java/javax/usb/tck/SignatureTest.java
@@ -10,6 +10,11 @@ package javax.usb.tck;
  */
 
 import javax.usb.tck.sigtest.*;
+
+import org.junit.runner.RunWith;
+
+import de.ailis.usb4java.TCKRunner;
+
 import java.io.*;
 import junit.framework.*;
 
@@ -24,6 +29,7 @@ import junit.framework.*;
  * @author Bob Rossi
  */
 @SuppressWarnings("all")
+@RunWith(TCKRunner.class)
 public class SignatureTest extends TestCase
 {
     /**
diff --git a/src/test/java/javax/usb/tck/UsbInterfacePolicyTest.java b/src/test/java/javax/usb/tck/UsbInterfacePolicyTest.java
index 3f6790c..c37a012 100755
--- a/src/test/java/javax/usb/tck/UsbInterfacePolicyTest.java
+++ b/src/test/java/javax/usb/tck/UsbInterfacePolicyTest.java
@@ -26,6 +26,10 @@ import java.util.*;
 
 import javax.usb.*;
 
+import org.junit.runner.RunWith;
+
+import de.ailis.usb4java.TCKRunner;
+
 /**
  * Usb Interface Policy Test
  * <p>
@@ -35,6 +39,7 @@ import javax.usb.*;
  * @author Dale Heeks
  */
 @SuppressWarnings("all")
+@RunWith(TCKRunner.class)
 public class UsbInterfacePolicyTest extends TestCase
 {