diff --git a/core/src/test/java/hudson/scheduler/CronTabTest.java b/core/src/test/java/hudson/scheduler/CronTabTest.java
index dac9ffd8641291bcdefdf7c0fedf7575c749317c..699b04da6f5cf8254c73748f0df6ad70c41e01a7 100644
--- a/core/src/test/java/hudson/scheduler/CronTabTest.java
+++ b/core/src/test/java/hudson/scheduler/CronTabTest.java
@@ -28,6 +28,7 @@ import java.text.DateFormat;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import junit.framework.TestCase;
+import org.jvnet.hudson.test.Bug;
 
 import static java.util.Calendar.MONDAY;
 
@@ -93,7 +94,7 @@ public class CronTabTest extends TestCase {
         compare(new GregorianCalendar(2010,7,1,0,0),x.floor(c));
     }
 
-    // @Bug(8401)
+    @Bug(8401)
     public void testFloor4() throws Exception {
         // conflict between DoM and DoW. In this we need to find a day that's the first day of a month and Sunday in 2010
         CronTab x = new CronTab("0 0 1 * 0");
diff --git a/pom.xml b/pom.xml
index 4236fdb4f3a45f8c02182fd0f3e4daa2d07488c2..6bc3216485b6a32cd1390e60d94684b3d41319a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -279,6 +279,12 @@ THE SOFTWARE.
       <version>1.0</version>
       <optional>true</optional><!-- no need to have this at runtime -->
     </dependency>
+    <dependency>
+      <groupId>org.jvnet.hudson</groupId>
+      <artifactId>test-annotations</artifactId>
+      <version>1.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   
   <dependencyManagement>
diff --git a/test/pom.xml b/test/pom.xml
index f13b3750eb557e9df4e35c570b1b8548664a2def..71d355be8d820355bc98597540648bd45af6d6c7 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -154,6 +154,12 @@ THE SOFTWARE.
       <artifactId>jetty</artifactId>
       <version>6.1.11</version>
     </dependency>
+    <dependency>
+      <groupId>org.jvnet.hudson</groupId>
+      <artifactId>test-annotations</artifactId>
+      <version>1.0</version>
+      <scope>compile</scope><!-- in this module we need this as a compile scope, whereas in the parent it's test -->
+    </dependency>
     <dependency>
       <groupId>org.jvnet.mock-javamail</groupId>
       <artifactId>mock-javamail</artifactId>
diff --git a/test/src/main/java/org/jvnet/hudson/test/Bug.java b/test/src/main/java/org/jvnet/hudson/test/Bug.java
deleted file mode 100644
index 848372d3eef32df6500588b4f96d0cd7ac8144a1..0000000000000000000000000000000000000000
--- a/test/src/main/java/org/jvnet/hudson/test/Bug.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * The MIT License
- * 
- * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package org.jvnet.hudson.test;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-
-/**
- * Marks a test case to a bug filed in the issue tracker.
- *
- * @author Kohsuke Kawaguchi
- */
-@Documented
-@Target({ElementType.METHOD, ElementType.TYPE})
-public @interface Bug {
-    /**
-     * Issue number.
-     */
-    int value();
-}
diff --git a/test/src/main/java/org/jvnet/hudson/test/Email.java b/test/src/main/java/org/jvnet/hudson/test/Email.java
deleted file mode 100644
index 5e9069d920c4d69a4c15cf634b7388c06c28a5bf..0000000000000000000000000000000000000000
--- a/test/src/main/java/org/jvnet/hudson/test/Email.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * The MIT License
- * 
- * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package org.jvnet.hudson.test;
-
-import java.lang.annotation.Documented;
-
-/**
- * Marks a test case to a bug reported in the mailing list.
- *
- * @author Kohsuke Kawaguchi
- * @see Url
- */
-@Documented
-public @interface Email {
-    /**
-     * URL to the e-mail archive.
-     *
-     * Look for the e-mail in
-     * <a href="http://www.nabble.com/Hudson-users-f16872.html">http://www.nabble.com/Hudson-users-f16872.html</a> or
-     * <a href="http://www.nabble.com/Hudson-dev-f25543.html">http://www.nabble.com/Hudson-dev-f25543.html</a>
-     */
-    String value();
-}
diff --git a/test/src/main/java/org/jvnet/hudson/test/For.java b/test/src/main/java/org/jvnet/hudson/test/For.java
deleted file mode 100644
index 856beb36d2650a983a3c6ce5faf7581e71e8b9c0..0000000000000000000000000000000000000000
--- a/test/src/main/java/org/jvnet/hudson/test/For.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * The MIT License
- *
- * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package org.jvnet.hudson.test;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-
-/**
- * Marks a test case as a test related to the specified production class.
- *
- * <p>
- * This can be used when the relationship between the test class and the test subject
- * is not obvious. 
- *
- * @author Kohsuke Kawaguchi
- * @since 1.351
- */
-@Documented
-@Target({ElementType.METHOD, ElementType.TYPE})
-public @interface For {
-    Class[] value();
-}
diff --git a/test/src/main/java/org/jvnet/hudson/test/Url.java b/test/src/main/java/org/jvnet/hudson/test/Url.java
deleted file mode 100644
index e8c9aedbadacbf932d9eac450736f40d4e984dfc..0000000000000000000000000000000000000000
--- a/test/src/main/java/org/jvnet/hudson/test/Url.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * The MIT License
- * 
- * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package org.jvnet.hudson.test;
-
-import java.lang.annotation.Documented;
-
-/**
- * Marks a test case to a bug reported in the other sources.
- *
- * @author Kohsuke Kawaguchi
- * @see Email
- */
-@Documented
-public @interface Url {
-    /**
-     * URL to the web page indicating a problem related to this test case.
-     */
-    String value();
-}