diff --git a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/performance/LoopHandler.java b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/performance/LoopHandler.java
new file mode 100644
index 00000000..da673e2e
--- /dev/null
+++ b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/performance/LoopHandler.java
@@ -0,0 +1,7 @@
+package org.eclipse.moquette.parser.netty.performance;
+
+/**
+ * Created by andrea on 6/2/15.
+ */
+public class LoopHandler {
+}
diff --git a/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/performance/ProtocolDecodingServer.java b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/performance/ProtocolDecodingServer.java
new file mode 100644
index 00000000..988e4ed5
--- /dev/null
+++ b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/performance/ProtocolDecodingServer.java
@@ -0,0 +1,7 @@
+package org.eclipse.moquette.parser.netty.performance;
+
+/**
+ * Created by andrea on 6/2/15.
+ */
+public class ProtocolDecodingServer {
+}
diff --git a/tools_scripts/benchmark/publisher_client.groovy b/tools_scripts/benchmark/publisher_client.groovy
index b9c5a1ed..fe498581 100644
--- a/tools_scripts/benchmark/publisher_client.groovy
+++ b/tools_scripts/benchmark/publisher_client.groovy
@@ -25,7 +25,7 @@ MqttClient client = new MqttClient("tcp://${host}:1883", "PublisherClient", data
 //connOptions.password = 'password' as char[]
 //Only for Apollo ---
 //client.connect(connOptions)
-client.connect(connOptions)
+client.connect()
 MqttMessage message = new MqttMessage('Hello world!!'.bytes)
 message.setQos(0)
 print "publishing..${numToSend} messages, "
diff --git a/tools_scripts/benchmark/subscriber_client.groovy b/tools_scripts/benchmark/subscriber_client.groovy
index 6e507058..b728a9be 100644
--- a/tools_scripts/benchmark/subscriber_client.groovy
+++ b/tools_scripts/benchmark/subscriber_client.groovy
@@ -17,9 +17,9 @@ class SubscriberCallback implements MqttCallback {
     int m_numReceived = 0
     long m_startTime
     boolean firstMessageReceived = false
-    
+
     private CountDownLatch m_latch = new CountDownLatch(1)
-    
+
     void waitFinish() {
         m_latch.await()
     }
@@ -39,7 +39,6 @@ class SubscriberCallback implements MqttCallback {
             long spentTime = stopTime - m_startTime
             println "/exit received"
             println "subscriber disconnected, received ${m_numReceived} messages in ${spentTime} ms"
-            client.disconnect()
             m_latch.countDown()
         } else {
             //println "-received ${message} on ${topic} with QoS ${message.qos}"
@@ -79,3 +78,4 @@ client.subscribe("/exit", 0)
 println "subscribed to /exit"
 
 callback.waitFinish()
+client.diconnect()