diff --git a/netty_parser/src/test/resources/log4j.properties b/netty_parser/src/test/resources/log4j.properties
index 2ee59103..922da482 100644
--- a/netty_parser/src/test/resources/log4j.properties
+++ b/netty_parser/src/test/resources/log4j.properties
@@ -4,7 +4,6 @@ log4j.rootLogger=INFO, stdout
 
 log4j.logger.io.moquette=WARN
 log4j.logger.io.netty.util=WARN
-log4j.logger.io.moquette.parser.netty.performance=WARN
 
 # stdout appender is set to be a ConsoleAppender.
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
diff --git a/perf/pom.xml b/perf/pom.xml
new file mode 100644
index 00000000..2c06cce9
--- /dev/null
+++ b/perf/pom.xml
@@ -0,0 +1,130 @@
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <relativePath>../</relativePath>
+        <artifactId>moquette-parent</artifactId>
+        <groupId>io.moquette</groupId>
+        <version>0.9-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>moquette-performance</artifactId>
+    <packaging>jar</packaging>
+    <name>Moquette - performance tests</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <bintray.package>io.moquette.moquette-performance</bintray.package>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>moquette-netty-parser</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!--<dependency>-->
+            <!--<groupId>io.netty</groupId>-->
+            <!--<artifactId>netty-common</artifactId>-->
+            <!--<version>${netty.version}</version>-->
+        <!--</dependency>-->
+        <!---->
+        <!--<dependency>-->
+            <!--<groupId>io.netty</groupId>-->
+            <!--<artifactId>netty-buffer</artifactId>-->
+            <!--<version>${netty.version}</version>-->
+        <!--</dependency>-->
+        <!---->
+        <!--<dependency>-->
+            <!--<groupId>io.netty</groupId>-->
+            <!--<artifactId>netty-transport</artifactId>-->
+            <!--<version>${netty.version}</version>-->
+        <!--</dependency>-->
+        <!---->
+        <!--<dependency>-->
+            <!--<groupId>io.netty</groupId>-->
+            <!--<artifactId>netty-handler</artifactId>-->
+            <!--<version>${netty.version}</version>-->
+        <!--</dependency>-->
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.6.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hdrhistogram</groupId>
+            <artifactId>HdrHistogram</artifactId>
+            <version>2.1.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.paho</groupId>
+            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.jetty.toolchain</groupId>
+            <artifactId>jetty-perf-helper</artifactId>
+            <version>1.0.5</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.2</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>io/moquette/parser/netty/TestUtils.java</exclude>
+                        <exclude>io/moquette/parser/netty/TestUtils$*</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+
+	    <!-- Includes to generate OSGi headers -->
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>  
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                    </archive> 
+                </configuration>
+            </plugin>  
+            <plugin>   
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>bundle-manifest</id>
+                        <phase>process-classes</phase>
+                        <goals>    
+                            <goal>manifest</goal>
+                        </goals>   
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    
+    <distributionManagement>
+        <repository>
+            <id>bintray</id>
+            <url>https://api.bintray.com/maven/${bintray.repo}/${bintray.package}</url>
+        </repository>
+    </distributionManagement>
+</project>
diff --git a/netty_parser/src/test/java/io/moquette/parser/netty/performance/BenchmarkPublisher.java b/perf/src/main/java/io/moquette/parser/netty/performance/BenchmarkPublisher.java
similarity index 100%
rename from netty_parser/src/test/java/io/moquette/parser/netty/performance/BenchmarkPublisher.java
rename to perf/src/main/java/io/moquette/parser/netty/performance/BenchmarkPublisher.java
diff --git a/netty_parser/src/test/java/io/moquette/parser/netty/performance/BenchmarkSubscriber.java b/perf/src/main/java/io/moquette/parser/netty/performance/BenchmarkSubscriber.java
similarity index 100%
rename from netty_parser/src/test/java/io/moquette/parser/netty/performance/BenchmarkSubscriber.java
rename to perf/src/main/java/io/moquette/parser/netty/performance/BenchmarkSubscriber.java
diff --git a/netty_parser/src/test/java/io/moquette/parser/netty/performance/LoopMQTTHandler.java b/perf/src/main/java/io/moquette/parser/netty/performance/LoopMQTTHandler.java
similarity index 100%
rename from netty_parser/src/test/java/io/moquette/parser/netty/performance/LoopMQTTHandler.java
rename to perf/src/main/java/io/moquette/parser/netty/performance/LoopMQTTHandler.java
diff --git a/netty_parser/src/test/java/io/moquette/parser/netty/performance/ProtocolDecodingServer.java b/perf/src/main/java/io/moquette/parser/netty/performance/ProtocolDecodingServer.java
similarity index 100%
rename from netty_parser/src/test/java/io/moquette/parser/netty/performance/ProtocolDecodingServer.java
rename to perf/src/main/java/io/moquette/parser/netty/performance/ProtocolDecodingServer.java
diff --git a/netty_parser/src/test/java/io/moquette/parser/netty/performance/ProtocolPublishDecodingServer.java b/perf/src/main/java/io/moquette/parser/netty/performance/ProtocolPublishDecodingServer.java
similarity index 100%
rename from netty_parser/src/test/java/io/moquette/parser/netty/performance/ProtocolPublishDecodingServer.java
rename to perf/src/main/java/io/moquette/parser/netty/performance/ProtocolPublishDecodingServer.java
diff --git a/netty_parser/src/test/java/io/moquette/parser/netty/performance/PublishBomber.java b/perf/src/main/java/io/moquette/parser/netty/performance/PublishBomber.java
similarity index 100%
rename from netty_parser/src/test/java/io/moquette/parser/netty/performance/PublishBomber.java
rename to perf/src/main/java/io/moquette/parser/netty/performance/PublishBomber.java
diff --git a/netty_parser/src/test/java/io/moquette/parser/netty/performance/PublishReceiverHandler.java b/perf/src/main/java/io/moquette/parser/netty/performance/PublishReceiverHandler.java
similarity index 100%
rename from netty_parser/src/test/java/io/moquette/parser/netty/performance/PublishReceiverHandler.java
rename to perf/src/main/java/io/moquette/parser/netty/performance/PublishReceiverHandler.java
diff --git a/pom.xml b/pom.xml
index ec8a1550..f8a72d80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,6 +75,7 @@
         <module>distribution</module>
         <module>embedding_moquette</module>
         <module>osgi_test</module>
+        <module>perf</module>
     </modules>
 
     <reporting>