diff --git a/cli/pom.xml b/cli/pom.xml
index 9483e881fab8ee69e19688115ec99cee9884b569..9cf816172917fd939a9c884bd5b361a6d9808025 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -25,7 +25,7 @@
     </dependency>
     <dependency>
       <groupId>junit</groupId>
-      <artifactId>junit-dep</artifactId>
+      <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/core/pom.xml b/core/pom.xml
index 947978786e4343594d02d860e552b442d86a25ef..daf00c8806bfa530f23204bdaea99a7d1710dfa1 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -443,7 +443,7 @@ THE SOFTWARE.
     </dependency>
     <dependency>
       <groupId>junit</groupId>
-      <artifactId>junit-dep</artifactId>
+      <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 56fc62b25adcb1381ea8ac107f68f12e729a5b52..b761ee70d260211e4eb701de5487825265684e7e 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -347,7 +347,7 @@ THE SOFTWARE.
     
     <dependency>
       <groupId>junit</groupId>
-      <artifactId>junit-dep</artifactId>
+      <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 63e928c5ff7dd5fabcf50200c4ee5e4a1b2098b9..6600ff384a850cc6c82a5cec19214fd6836916e8 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.29</version>
+    <version>1.30</version>
     <relativePath />
   </parent>
 
@@ -65,12 +65,6 @@
       <version>1.505-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit-dep</artifactId>
-      <version>4.10</version>
-      <scope>test</scope>
-    </dependency>
     <!--
       Maven is so brain-dead that when a dependency is like:
 
diff --git a/pom.xml b/pom.xml
index 9cdbd069d74817610f7388efd6e6ee4b5d867cef..e5dd2d29d4585d4fd3bbef151a580a55dd05c130 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.29</version>
+    <version>1.30</version>
   </parent>
 
   <groupId>org.jenkins-ci.main</groupId>
@@ -145,20 +145,8 @@ THE SOFTWARE.
 
       <dependency>
         <groupId>junit</groupId>
-        <artifactId>junit-dep</artifactId>
-        <version>4.10</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest-core</artifactId>
-        <version>1.2.1</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest-library</artifactId>
-        <version>1.2.1</version>
+        <artifactId>junit</artifactId>
+        <version>4.11</version>
       </dependency>
 
       <dependency>
diff --git a/test/pom.xml b/test/pom.xml
index e5d7e6dfd963f3b2b0fb9c89edfb0fa0a3d3a3f4..43c1e75ac97f417271d86f2cfbc22dfd591e85a0 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -100,11 +100,12 @@ THE SOFTWARE.
     </dependency>
     <dependency>
       <groupId>junit</groupId>
-      <artifactId>junit-dep</artifactId>
+      <artifactId>junit</artifactId>
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-library</artifactId>
+      <version>1.3</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci</groupId>