diff --git a/src/main/java/io/bitsquare/app/ArgumentParser.java b/src/main/java/io/bitsquare/app/ArgumentParser.java
index 39ca8f2743..53a312d792 100644
--- a/src/main/java/io/bitsquare/app/ArgumentParser.java
+++ b/src/main/java/io/bitsquare/app/ArgumentParser.java
@@ -18,6 +18,7 @@
 package io.bitsquare.app;
 
 import io.bitsquare.network.BootstrapNode;
+import io.bitsquare.network.Node;
 
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.inf.ArgumentParserException;
@@ -37,9 +38,7 @@ public class ArgumentParser {
     public static final String PORT_FLAG = "port";
     public static final String INTERFACE_HINT_FLAG = "interface";
     public static final String NAME_FLAG = "name";
-
-    private static final Integer PORT_DEFAULT = 5000;
-    private static final String PEER_ID_DEFAULT = BootstrapNode.DIGITAL_OCEAN1.getId();
+    public static final String PEER_ID_DEFAULT = BootstrapNode.DIGITAL_OCEAN1.getId();
 
     private final net.sourceforge.argparse4j.inf.ArgumentParser parser;
 
@@ -51,7 +50,7 @@ public class ArgumentParser {
                 .setDefault(PEER_ID_DEFAULT)
                 .help("Seed peer ID.");
         parser.addArgument("-p", "--" + PORT_FLAG)
-                .setDefault(PORT_DEFAULT)
+                .setDefault(Node.DEFAULT_PORT)
                 .help("IP port to listen on.");
         parser.addArgument("-i", "--" + INTERFACE_HINT_FLAG)
                 .help("Network interface to listen on.");
diff --git a/src/main/java/io/bitsquare/network/BootstrapNode.java b/src/main/java/io/bitsquare/network/BootstrapNode.java
index 14dfd2523b..a997072fd5 100644
--- a/src/main/java/io/bitsquare/network/BootstrapNode.java
+++ b/src/main/java/io/bitsquare/network/BootstrapNode.java
@@ -18,13 +18,17 @@
 package io.bitsquare.network;
 
 public enum BootstrapNode implements Node {
-    LOCALHOST("localhost", "127.0.0.1", 5000),
-    DIGITAL_OCEAN1("digitalocean1.bitsquare.io", "188.226.179.109", 5000);
+    LOCALHOST("localhost", "127.0.0.1"),
+    DIGITAL_OCEAN1("digitalocean1.bitsquare.io", "188.226.179.109");
 
     private final String id;
     private final String ip;
     private final int port;
 
+    BootstrapNode(String id, String ip) {
+        this(id, ip, DEFAULT_PORT);
+    }
+
     BootstrapNode(String id, String ip, int port) {
         this.id = id;
         this.ip = ip;
diff --git a/src/main/java/io/bitsquare/network/Node.java b/src/main/java/io/bitsquare/network/Node.java
index e0f10b3b07..1018e84234 100644
--- a/src/main/java/io/bitsquare/network/Node.java
+++ b/src/main/java/io/bitsquare/network/Node.java
@@ -19,6 +19,8 @@ package io.bitsquare.network;
 
 public interface Node {
 
+    public static final int DEFAULT_PORT = 5000;
+
     String getId();
 
     String getIp();
diff --git a/src/test/java/io/bitsquare/msg/SeedNodeForTesting.java b/src/test/java/io/bitsquare/msg/SeedNodeForTesting.java
index cee0df632f..30036be4fc 100644
--- a/src/test/java/io/bitsquare/msg/SeedNodeForTesting.java
+++ b/src/test/java/io/bitsquare/msg/SeedNodeForTesting.java
@@ -17,6 +17,8 @@
 
 package io.bitsquare.msg;
 
+import io.bitsquare.network.Node;
+
 import net.tomp2p.dht.PeerBuilderDHT;
 import net.tomp2p.dht.PeerDHT;
 import net.tomp2p.nat.PeerBuilderNAT;
@@ -37,7 +39,7 @@ public class SeedNodeForTesting {
     public static void main(String[] args) throws Exception {
         // Define your seed node IP and port
         // "127.0.0.1" for localhost or SEED_ID_WAN_1
-        new SeedNodeForTesting().startSeedNode("localhost", 5000);
+        new SeedNodeForTesting().startSeedNode("localhost", Node.DEFAULT_PORT);
     }
 
     public Thread startSeedNode(String seedNodeId, int seedNodePort) {