diff --git a/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationFuseTest.java b/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationFuseTest.java
index 758040ce..dc48254a 100644
--- a/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationFuseTest.java
+++ b/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationFuseTest.java
@@ -24,7 +24,6 @@ import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
 import static org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME;
@@ -185,13 +184,11 @@ public class ServerIntegrationFuseTest {
         m_subscriber.connect();
         Topic[] topics = new Topic[]{new Topic("/topic", QoS.AT_LEAST_ONCE)};
         m_subscriber.subscribe(topics);
-        System.out.println("***Subscriber listen to /topic and disonnect");
         m_subscriber.disconnect();
         
         //force the publisher to send
         m_publisher.publish("/topic", "Hello world MQTT!!-1".getBytes(), QoS.AT_LEAST_ONCE, false);
-        System.out.println("***Publisher published to /topic :: Hello world MQTT!!-1");
-        
+
         //reconnect and expect to receive the hello 2 message
         m_subscriber = m_mqtt.blockingConnection();
         m_subscriber.connect();
@@ -201,7 +198,6 @@ public class ServerIntegrationFuseTest {
         assertNotNull(msg);
         msg.ack();
         assertEquals("Hello world MQTT!!-1", new String(msg.getPayload()));
-        System.out.println(String.format("***Subscriber received message <%s> from /topic", new String(msg.getPayload())));
 //        m_subscriber.disconnect();
     }
     
@@ -222,8 +218,7 @@ public class ServerIntegrationFuseTest {
         Topic[] topics = new Topic[]{new Topic("topic", QoS.EXACTLY_ONCE)};
         m_subscriber.subscribe(topics);
         m_subscriber.disconnect();
-        System.out.println("***Subscriber listen to topic and disconnects");
-        
+
         MQTT mqtt = new MQTT();
         mqtt.setHost("localhost", 1883); 
         mqtt.setClientId("Publisher");
@@ -232,15 +227,13 @@ public class ServerIntegrationFuseTest {
         m_publisher.publish("topic", "Hello1".getBytes(), QoS.EXACTLY_ONCE, true);
         m_publisher.publish("topic", "Hello2".getBytes(), QoS.EXACTLY_ONCE, true);
         m_publisher.disconnect();
-        System.out.println("***Publisher published 2 messges to topic and disconnects");
-        
+
         //subscriber reconnects
         m_mqtt = new MQTT();
         m_mqtt.setHost("localhost", 1883); 
         m_mqtt.setClientId("Subscriber");
         m_mqtt.setCleanSession(false);
         m_subscriber = m_mqtt.blockingConnection();
-        System.out.println("***Subscriber reconnects");
         m_subscriber.connect();
         //subscriber should receive the 2 messages missed
         Message msg = m_subscriber.receive(1, TimeUnit.SECONDS);
diff --git a/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationSSLTest.java b/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationSSLTest.java
index 8cdf78eb..44fd9993 100644
--- a/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationSSLTest.java
+++ b/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationSSLTest.java
@@ -89,12 +89,15 @@ public class ServerIntegrationSSLTest {
 
     @After
     public void tearDown() throws Exception {
-        if (m_client.isConnected()) {
+        if (m_client != null && m_client.isConnected()) {
             m_client.disconnect();
         }
 
-        m_server.stopServer();
-        File dbFile = new File(m_server.getProperties().getProperty(org.eclipse.moquette.commons.Constants.PERSISTENT_STORE_PROPERTY_NAME));
+        if (m_server != null) {
+            m_server.stopServer();
+        }
+        String dbPath = IntegrationUtils.localMapDBPath();
+        File dbFile = new File(dbPath);
         if (dbFile.exists()) {
             dbFile.delete();
         }
diff --git a/broker/src/test/java/org/eclipse/moquette/server/ServerRestartIntegrationTest.java b/broker/src/test/java/org/eclipse/moquette/server/ServerRestartIntegrationTest.java
index 5b04fe0c..52be3a8b 100644
--- a/broker/src/test/java/org/eclipse/moquette/server/ServerRestartIntegrationTest.java
+++ b/broker/src/test/java/org/eclipse/moquette/server/ServerRestartIntegrationTest.java
@@ -18,6 +18,7 @@ package org.eclipse.moquette.server;
 import org.fusesource.mqtt.client.*;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -94,7 +95,7 @@ public class ServerRestartIntegrationTest {
         }
         
         //restart the server
-        m_server.startServer();
+        m_server.startServer(IntegrationUtils.prepareTestPropeties());
         
         //reconnect the Subscriber subscribing to the same /topic but different QoS
         m_subscriber = m_mqtt.blockingConnection();
@@ -129,7 +130,7 @@ public class ServerRestartIntegrationTest {
         m_server.stopServer();
 
         //restart the server
-        m_server.startServer();
+        m_server.startServer(IntegrationUtils.prepareTestPropeties());
 
         MQTT mqtt = new MQTT();
         mqtt.setHost("localhost", 1883);