diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index 9f91ee9024ba..af6fdd1f86a6 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -292,7 +292,7 @@ public def layoutCommunityPlugins(String home) {
 
     pluginDir("testng") {
       dir("lib") {
-        jar("testng.jar") {
+        jar("testng-plugin.jar") {
           noResources("testng")
           noResources("testng_rt")
         }
@@ -300,13 +300,7 @@ public def layoutCommunityPlugins(String home) {
         resources("testng")
 
         fileset(dir: "$home/plugins/testng/lib") {
-          include(name: "testng-jdk15.jar")
-        }
-      }
-
-      dir("lib-jdk14") {
-        fileset(dir: "$home/plugins/testng/lib") {
-          include(name: "testng-jdk14.jar")
+          include(name: "testng.jar")
         }
       }
     }
diff --git a/plugins/testng/lib/testng-jdk15.jar b/plugins/testng/lib/testng.jar
similarity index 100%
rename from plugins/testng/lib/testng-jdk15.jar
rename to plugins/testng/lib/testng.jar