diff --git a/test/src/main/java/org/jvnet/hudson/test/Bug.java b/test/src/main/java/org/jvnet/hudson/test/Bug.java
index b9aa10ea28..0e3eea94d5 100644
--- a/test/src/main/java/org/jvnet/hudson/test/Bug.java
+++ b/test/src/main/java/org/jvnet/hudson/test/Bug.java
@@ -1,10 +1,13 @@
package org.jvnet.hudson.test;
+import java.lang.annotation.Documented;
+
/**
* Marks a test case to a bug filed in the issue tracker.
*
* @author Kohsuke Kawaguchi
*/
+@Documented
public @interface Bug {
/**
* Issue number.
diff --git a/test/src/main/java/org/jvnet/hudson/test/Email.java b/test/src/main/java/org/jvnet/hudson/test/Email.java
new file mode 100644
index 0000000000..dae1505f51
--- /dev/null
+++ b/test/src/main/java/org/jvnet/hudson/test/Email.java
@@ -0,0 +1,20 @@
+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
+ */
+@Documented
+public @interface Email {
+ /**
+ * URL to the e-mail archive.
+ *
+ * Look for the e-mail in
+ * http://www.nabble.com/Hudson-users-f16872.html or
+ * http://www.nabble.com/Hudson-dev-f25543.html
+ */
+ String value();
+}