diff --git a/etcd3gw/client.py b/etcd3gw/client.py
index 4cda9e7..cce3536 100644
--- a/etcd3gw/client.py
+++ b/etcd3gw/client.py
@@ -64,7 +64,9 @@ def get_url(self, path):
         :param path:
         :return: url
         """
-        base_url = self.protocol + '://' + self.host + ':' + str(self.port)
+        host = ('[' + self.host + ']' if (self.host.find(':') != -1)
+                else self.host)
+        base_url = self.protocol + '://' + host + ':' + str(self.port)
         return base_url + '/v3alpha/' + path.lstrip("/")
 
     def post(self, *args, **kwargs):
diff --git a/etcd3gw/tests/test_client.py b/etcd3gw/tests/test_client.py
new file mode 100644
index 0000000..b867ca6
--- /dev/null
+++ b/etcd3gw/tests/test_client.py
@@ -0,0 +1,32 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+from etcd3gw.client import Etcd3Client
+from etcd3gw.tests import base
+
+
+class TestEtcd3Gateway(base.TestCase):
+
+    def test_client_default(self):
+        client = Etcd3Client()
+        self.assertEqual("http://localhost:2379/v3alpha/lease/grant",
+                         client.get_url("/lease/grant"))
+
+    def test_client_ipv4(self):
+        client = Etcd3Client(host="127.0.0.1")
+        self.assertEqual("http://127.0.0.1:2379/v3alpha/lease/grant",
+                         client.get_url("/lease/grant"))
+
+    def test_client_ipv6(self):
+        client = Etcd3Client(host="::1")
+        self.assertEqual("http://[::1]:2379/v3alpha/lease/grant",
+                         client.get_url("/lease/grant"))