diff --git a/pom.xml b/pom.xml
index 71b9d40625..4e6f9a764a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -512,8 +512,8 @@
     <module>handler-proxy</module>
     <module>example</module>
     <module>testsuite</module>
+    <module>testsuite-osgi</module>
     <module>microbench</module>
-    <module>osgitests</module>
     <module>all</module>
     <module>tarball</module>
   </modules>
diff --git a/osgitests/pom.xml b/testsuite-osgi/pom.xml
similarity index 98%
rename from osgitests/pom.xml
rename to testsuite-osgi/pom.xml
index c86709a916..86d3f1d33c 100644
--- a/osgitests/pom.xml
+++ b/testsuite-osgi/pom.xml
@@ -23,10 +23,10 @@
     <version>5.0.0.Alpha2-SNAPSHOT</version>
   </parent>
 
-  <artifactId>netty-osgitests</artifactId>
+  <artifactId>netty-testsuite-osgi</artifactId>
   <packaging>jar</packaging>
 
-  <name>Netty/OsgiTests</name>
+  <name>Netty/Testsuite/OSGI</name>
 
   <properties>
     <exam.version>4.4.0</exam.version>
diff --git a/osgitests/src/test/java/io/netty/osgitests/OsgiBundleTest.java b/testsuite-osgi/src/test/java/io/netty/osgitests/OsgiBundleTest.java
similarity index 100%
rename from osgitests/src/test/java/io/netty/osgitests/OsgiBundleTest.java
rename to testsuite-osgi/src/test/java/io/netty/osgitests/OsgiBundleTest.java
diff --git a/osgitests/src/test/java/io/netty/osgitests/package-info.java b/testsuite-osgi/src/test/java/io/netty/osgitests/package-info.java
similarity index 100%
rename from osgitests/src/test/java/io/netty/osgitests/package-info.java
rename to testsuite-osgi/src/test/java/io/netty/osgitests/package-info.java