diff --git a/src/main/java/ch/hepia/communication/Client.java b/src/main/java/ch/hepia/communication/Client.java
index e5ca545a573866b6e4325d317e61aa8b23216d17..85c8f98513251af8ec4153714a6b3f0f4c60d175 100644
--- a/src/main/java/ch/hepia/communication/Client.java
+++ b/src/main/java/ch/hepia/communication/Client.java
@@ -22,7 +22,6 @@ import ch.hepia.model.House;
 public class Client {
     private static int ackMode;
     private static String clientQueueName;
-    private static String messageBrokerUrl;
 
     private boolean transacted = false;
 
@@ -30,13 +29,15 @@ public class Client {
     private Optional<MessageProducer> maybeProducer;
 
     static {
-        messageBrokerUrl = "tcp://localhost:61616";
         clientQueueName = "client.messages";
         ackMode = Session.AUTO_ACKNOWLEDGE;
     }
 
-    public Client() {
-        ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(messageBrokerUrl);
+    public Client(final String ipBroker) {
+
+        final String brokerUrl = "tcp://" + ipBroker + ":61616";
+
+        ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(brokerUrl);
         try {
             Connection connection = connectionFactory.createConnection();
             connection.start();
@@ -103,7 +104,7 @@ public class Client {
     }
 
     public static void main(String[] args) {
-        Client c = new Client();
+        Client c = new Client( args.length == 1 ? args[0] : "localhost" );
         c.send("COUCOU");
 
         ArrayList<String> names = new ArrayList<>();
diff --git a/src/main/java/ch/hepia/communication/Server.java b/src/main/java/ch/hepia/communication/Server.java
index 2ac30ac8f48466ec1d1ee09c5332cd497b1fd2ce..16a93c09188b1e26ff7fca1b5210618996c62198 100644
--- a/src/main/java/ch/hepia/communication/Server.java
+++ b/src/main/java/ch/hepia/communication/Server.java
@@ -6,19 +6,19 @@ import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
 
 public class Server {
-    private static String messageBrokerUrl = "tcp://localhost:61616";
 
-    public Server() {
+    public Server(String ipBroker) {
         try {
-            //This message broker is embedded
-            BrokerService broker = new BrokerService();
+            final String brokerUrl = "tcp://" + ipBroker + ":61616";
+            final BrokerService broker = new BrokerService();
+
             broker.setPersistent(false);
             broker.setUseJmx(false);
-            broker.addConnector(messageBrokerUrl);
+            broker.addConnector(brokerUrl);
             broker.start();
 
-            ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(messageBrokerUrl);
-            Connection connection = connectionFactory.createConnection();
+            final ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(brokerUrl);
+            final Connection connection = connectionFactory.createConnection();
             connection.start();
 
         } catch (Exception e) {
@@ -27,6 +27,8 @@ public class Server {
     }
 
     public static void main(String[] args) {
-        new Server();
+        System.out.println(args[0]);
+
+        new Server( args.length == 1 ? args[0] : "localhost");
     }
 }