diff --git a/pom.xml b/pom.xml
index ea8243fb21..9aa3f4e427 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,10 @@
     <module>handler</module>
     <module>example</module>
     <module>testsuite</module>
-    <!-- add "verify" back after karaf release -->
+    <!--
+    <module>testsuite-osgi</module>
+    <module>microbench</module>
+    -->
     <module>all</module>
     <module>tarball</module>
   </modules>
diff --git a/verify/.gitignore b/testsuite-osgi/.gitignore
similarity index 100%
rename from verify/.gitignore
rename to testsuite-osgi/.gitignore
diff --git a/verify/pom.xml b/testsuite-osgi/pom.xml
similarity index 87%
rename from verify/pom.xml
rename to testsuite-osgi/pom.xml
index 97394a3f8e..ca1e2c8318 100644
--- a/verify/pom.xml
+++ b/testsuite-osgi/pom.xml
@@ -24,21 +24,20 @@
     <version>4.0.0.Beta1-SNAPSHOT</version>
   </parent>
 
-  <artifactId>netty-verify</artifactId>
+  <artifactId>netty-testsuite-osgi-parent</artifactId>
   <packaging>pom</packaging>
 
-  <name>Netty/Verify</name>
+  <name>Netty/Testsuite/OSGi</name>
   <description>parent for build constrains modules</description>
 
   <modules>
-    <module>verify-osgi-split</module>
-    <module>verify-osgi-deps</module>
-    <module>verify-osgi-exam</module>
+    <module>testsuite-osgi-split</module>
+    <module>testsuite-osgi-deps</module>
+    <module>testsuite-osgi-exam</module>
   </modules>
 
   <build>
     <plugins>
-    
       <!-- do not deploy this artifact -->
       <plugin>
         <artifactId>maven-deploy-plugin</artifactId>
@@ -48,5 +47,4 @@
       </plugin>
     </plugins>
   </build>
-  
 </project>
diff --git a/verify/readme.md b/testsuite-osgi/readme.md
similarity index 100%
rename from verify/readme.md
rename to testsuite-osgi/readme.md
diff --git a/verify/verify-osgi-deps/pom.xml b/testsuite-osgi/testsuite-osgi-deps/pom.xml
similarity index 91%
rename from verify/verify-osgi-deps/pom.xml
rename to testsuite-osgi/testsuite-osgi-deps/pom.xml
index f3c6d78521..8654d0e16d 100644
--- a/verify/verify-osgi-deps/pom.xml
+++ b/testsuite-osgi/testsuite-osgi-deps/pom.xml
@@ -20,16 +20,29 @@
   
   <parent>
     <groupId>io.netty</groupId>
-    <artifactId>netty-verify</artifactId>
+    <artifactId>netty-testsuite-osgi-parent</artifactId>
     <version>4.0.0.Beta1-SNAPSHOT</version>
   </parent>
 
-  <artifactId>netty-verify-osgi-deps</artifactId>
+  <artifactId>netty-testsuite-osgi-deps</artifactId>
   <packaging>feature</packaging>
 
-  <name>Netty/Verify/OSGi/Deps</name>
+  <name>Netty/Testsuite/OSGi/Deps</name>
   <description>verify osgi compliance: all transitive dependencies must be osgi bundles</description>
 
+  <pluginRepositories>
+    <pluginRepository>
+      <id>asf</id>
+      <url>http://repository.apache.org/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
   <dependencies>
   
     <!-- MAIN -->
@@ -98,7 +111,7 @@
     
     <!-- file/text conversion -->
     <dependency>
-        <groupId>org.apache.commons</groupId>
+        <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
         <version>1.3.2</version>
         <scope>test</scope>
diff --git a/verify/verify-osgi-deps/readme.md b/testsuite-osgi/testsuite-osgi-deps/readme.md
similarity index 100%
rename from verify/verify-osgi-deps/readme.md
rename to testsuite-osgi/testsuite-osgi-deps/readme.md
diff --git a/verify/verify-osgi-deps/src/main/java/io/netty/verify/osgi/Dummy.java b/testsuite-osgi/testsuite-osgi-deps/src/main/java/io/netty/verify/osgi/Dummy.java
similarity index 100%
rename from verify/verify-osgi-deps/src/main/java/io/netty/verify/osgi/Dummy.java
rename to testsuite-osgi/testsuite-osgi-deps/src/main/java/io/netty/verify/osgi/Dummy.java
diff --git a/verify/verify-osgi-deps/src/main/java/io/netty/verify/osgi/package-info.java b/testsuite-osgi/testsuite-osgi-deps/src/main/java/io/netty/verify/osgi/package-info.java
similarity index 100%
rename from verify/verify-osgi-deps/src/main/java/io/netty/verify/osgi/package-info.java
rename to testsuite-osgi/testsuite-osgi-deps/src/main/java/io/netty/verify/osgi/package-info.java
diff --git a/verify/verify-osgi-deps/src/test/java/io/netty/verify/osgi/DependencyIT.java b/testsuite-osgi/testsuite-osgi-deps/src/test/java/io/netty/verify/osgi/DependencyIT.java
similarity index 100%
rename from verify/verify-osgi-deps/src/test/java/io/netty/verify/osgi/DependencyIT.java
rename to testsuite-osgi/testsuite-osgi-deps/src/test/java/io/netty/verify/osgi/DependencyIT.java
diff --git a/verify/verify-osgi-exam/.gitignore b/testsuite-osgi/testsuite-osgi-exam/.gitignore
similarity index 100%
rename from verify/verify-osgi-exam/.gitignore
rename to testsuite-osgi/testsuite-osgi-exam/.gitignore
diff --git a/verify/verify-osgi-exam/pom.xml b/testsuite-osgi/testsuite-osgi-exam/pom.xml
similarity index 98%
rename from verify/verify-osgi-exam/pom.xml
rename to testsuite-osgi/testsuite-osgi-exam/pom.xml
index cc2af5548f..4a5e4f8fc2 100644
--- a/verify/verify-osgi-exam/pom.xml
+++ b/testsuite-osgi/testsuite-osgi-exam/pom.xml
@@ -20,14 +20,14 @@
   
   <parent>
     <groupId>io.netty</groupId>
-    <artifactId>netty-verify</artifactId>
+    <artifactId>netty-testsuite-osgi-parent</artifactId>
     <version>4.0.0.Beta1-SNAPSHOT</version>
   </parent>
 
-  <artifactId>netty-verify-osgi-exam</artifactId>
+  <artifactId>netty-testsuite-osgi-exam</artifactId>
   <packaging>bundle</packaging>
 
-  <name>Netty/Verify/OSGi/Exam</name>
+  <name>Netty/Testsuite/OSGi/Exam</name>
   <description>verify osgi compliance: run tests inside osgi framework</description>
 
   <properties>
diff --git a/verify/verify-osgi-exam/readme.md b/testsuite-osgi/testsuite-osgi-exam/readme.md
similarity index 100%
rename from verify/verify-osgi-exam/readme.md
rename to testsuite-osgi/testsuite-osgi-exam/readme.md
diff --git a/verify/verify-osgi-exam/src/main/java/io/netty/verify/osgi/NettyService.java b/testsuite-osgi/testsuite-osgi-exam/src/main/java/io/netty/verify/osgi/NettyService.java
similarity index 100%
rename from verify/verify-osgi-exam/src/main/java/io/netty/verify/osgi/NettyService.java
rename to testsuite-osgi/testsuite-osgi-exam/src/main/java/io/netty/verify/osgi/NettyService.java
diff --git a/verify/verify-osgi-exam/src/main/java/io/netty/verify/osgi/NettyServiceProvider.java b/testsuite-osgi/testsuite-osgi-exam/src/main/java/io/netty/verify/osgi/NettyServiceProvider.java
similarity index 100%
rename from verify/verify-osgi-exam/src/main/java/io/netty/verify/osgi/NettyServiceProvider.java
rename to testsuite-osgi/testsuite-osgi-exam/src/main/java/io/netty/verify/osgi/NettyServiceProvider.java
diff --git a/verify/verify-osgi-exam/src/main/java/io/netty/verify/osgi/package-info.java b/testsuite-osgi/testsuite-osgi-exam/src/main/java/io/netty/verify/osgi/package-info.java
similarity index 100%
rename from verify/verify-osgi-exam/src/main/java/io/netty/verify/osgi/package-info.java
rename to testsuite-osgi/testsuite-osgi-exam/src/main/java/io/netty/verify/osgi/package-info.java
diff --git a/verify/verify-osgi-exam/src/main/resources/META-INF/links/org.ops4j.pax.logging.api.link b/testsuite-osgi/testsuite-osgi-exam/src/main/resources/META-INF/links/org.ops4j.pax.logging.api.link
similarity index 100%
rename from verify/verify-osgi-exam/src/main/resources/META-INF/links/org.ops4j.pax.logging.api.link
rename to testsuite-osgi/testsuite-osgi-exam/src/main/resources/META-INF/links/org.ops4j.pax.logging.api.link
diff --git a/verify/verify-osgi-exam/src/main/resources/META-INF/links/readme.md b/testsuite-osgi/testsuite-osgi-exam/src/main/resources/META-INF/links/readme.md
similarity index 100%
rename from verify/verify-osgi-exam/src/main/resources/META-INF/links/readme.md
rename to testsuite-osgi/testsuite-osgi-exam/src/main/resources/META-INF/links/readme.md
diff --git a/verify/verify-osgi-exam/src/test/java/io/netty/verify/osgi/BasicFrameworkIT.java b/testsuite-osgi/testsuite-osgi-exam/src/test/java/io/netty/verify/osgi/BasicFrameworkIT.java
similarity index 100%
rename from verify/verify-osgi-exam/src/test/java/io/netty/verify/osgi/BasicFrameworkIT.java
rename to testsuite-osgi/testsuite-osgi-exam/src/test/java/io/netty/verify/osgi/BasicFrameworkIT.java
diff --git a/verify/verify-osgi-exam/src/test/java/io/netty/verify/osgi/NioUdtMessageRendezvousChannelIT.java b/testsuite-osgi/testsuite-osgi-exam/src/test/java/io/netty/verify/osgi/NioUdtMessageRendezvousChannelIT.java
similarity index 100%
rename from verify/verify-osgi-exam/src/test/java/io/netty/verify/osgi/NioUdtMessageRendezvousChannelIT.java
rename to testsuite-osgi/testsuite-osgi-exam/src/test/java/io/netty/verify/osgi/NioUdtMessageRendezvousChannelIT.java
diff --git a/verify/verify-osgi-exam/src/test/java/io/netty/verify/osgi/UnitHelp.java b/testsuite-osgi/testsuite-osgi-exam/src/test/java/io/netty/verify/osgi/UnitHelp.java
similarity index 100%
rename from verify/verify-osgi-exam/src/test/java/io/netty/verify/osgi/UnitHelp.java
rename to testsuite-osgi/testsuite-osgi-exam/src/test/java/io/netty/verify/osgi/UnitHelp.java
diff --git a/verify/verify-osgi-exam/src/test/resources/logback-test.xml b/testsuite-osgi/testsuite-osgi-exam/src/test/resources/logback-test.xml
similarity index 100%
rename from verify/verify-osgi-exam/src/test/resources/logback-test.xml
rename to testsuite-osgi/testsuite-osgi-exam/src/test/resources/logback-test.xml
diff --git a/verify/verify-osgi-split/pom.xml b/testsuite-osgi/testsuite-osgi-split/pom.xml
similarity index 95%
rename from verify/verify-osgi-split/pom.xml
rename to testsuite-osgi/testsuite-osgi-split/pom.xml
index b1abba0726..17922537bf 100644
--- a/verify/verify-osgi-split/pom.xml
+++ b/testsuite-osgi/testsuite-osgi-split/pom.xml
@@ -20,14 +20,14 @@
   
   <parent>
     <groupId>io.netty</groupId>
-    <artifactId>netty-verify</artifactId>
+    <artifactId>netty-testsuite-osgi-parent</artifactId>
     <version>4.0.0.Beta1-SNAPSHOT</version>
   </parent>
 
-  <artifactId>netty-verify-osgi-split</artifactId>
+  <artifactId>netty-testsuite-osgi-split</artifactId>
   <packaging>bundle</packaging>
 
-  <name>Netty/Verify/OSGi/Split</name>
+  <name>Netty/Testsuite/OSGi/Split</name>
   <description>verify osgi compliance: prohibit split packages</description>
 
   <dependencies>
@@ -113,5 +113,4 @@
       
     </plugins>
   </build>
-  
 </project>
diff --git a/verify/verify-osgi-split/readme.md b/testsuite-osgi/testsuite-osgi-split/readme.md
similarity index 100%
rename from verify/verify-osgi-split/readme.md
rename to testsuite-osgi/testsuite-osgi-split/readme.md
diff --git a/verify/verify-osgi-split/src/main/java/io/netty/verify/osgi/Dummy.java b/testsuite-osgi/testsuite-osgi-split/src/main/java/io/netty/verify/osgi/Dummy.java
similarity index 100%
rename from verify/verify-osgi-split/src/main/java/io/netty/verify/osgi/Dummy.java
rename to testsuite-osgi/testsuite-osgi-split/src/main/java/io/netty/verify/osgi/Dummy.java
diff --git a/verify/verify-osgi-split/src/main/java/io/netty/verify/osgi/package-info.java b/testsuite-osgi/testsuite-osgi-split/src/main/java/io/netty/verify/osgi/package-info.java
similarity index 100%
rename from verify/verify-osgi-split/src/main/java/io/netty/verify/osgi/package-info.java
rename to testsuite-osgi/testsuite-osgi-split/src/main/java/io/netty/verify/osgi/package-info.java
diff --git a/verify/verify-osgi-split/src/test/java/io/netty/verify/osgi/TestDummy.java b/testsuite-osgi/testsuite-osgi-split/src/test/java/io/netty/verify/osgi/TestDummy.java
similarity index 100%
rename from verify/verify-osgi-split/src/test/java/io/netty/verify/osgi/TestDummy.java
rename to testsuite-osgi/testsuite-osgi-split/src/test/java/io/netty/verify/osgi/TestDummy.java