diff --git a/silkaj/network_tools.py b/silkaj/network_tools.py
index 5b0cd1d319ca06eddf895986e37a05adb61d0c19..1af4671b878f630b953789fc1ef0041ee420b802 100644
--- a/silkaj/network_tools.py
+++ b/silkaj/network_tools.py
@@ -76,7 +76,10 @@ class EndPoint(object):
     def __init__(self):
         cli_args = Command()
         ep = dict()
-        ep["domain"], ep["port"] = G1_TEST_DEFAULT_ENDPOINT if cli_args.contains_switches("gtest") else G1_DEFAULT_ENDPOINT
+        if cli_args.contains_switches('p'):
+            ep["domain"], ep["port"] = cli_args.get_definition('p').rsplit(':', 1)
+        else:
+            ep["domain"], ep["port"] = G1_TEST_DEFAULT_ENDPOINT if cli_args.contains_switches("gtest") else G1_DEFAULT_ENDPOINT
         self.ep = ep