diff --git a/README.md b/README.md
index 249ea0e0..2989ee71 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ You need four items in order to connect to MinIO object storage server.
 from minio import Minio
 from minio.error import ResponseError
 
-minioClient = Minio('play.min.io:9000',
+minioClient = Minio('play.min.io',
                   access_key='Q3AM3UQ867SPQQA43P2F',
                   secret_key='zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG',
                   secure=True)
@@ -55,7 +55,7 @@ minioClient = Minio('play.min.io:9000',
 ## Quick Start Example - File Uploader
 This example program connects to a MinIO object storage server, makes a bucket on the server and then uploads a file to the bucket.
 
-We will use the MinIO server running at [https://play.min.io:9000](https://play.min.io:9000) in this example. Feel free to use this service for testing and development. Access credentials shown in this example are open to the public.
+We will use the MinIO server running at [https://play.min.io](https://play.min.io) in this example. Feel free to use this service for testing and development. Access credentials shown in this example are open to the public.
 
 #### file-uploader.py
 
@@ -66,7 +66,7 @@ from minio.error import (ResponseError, BucketAlreadyOwnedByYou,
                          BucketAlreadyExists)
 
 # Initialize minioClient with an endpoint and access/secret keys.
-minioClient = Minio('play.min.io:9000',
+minioClient = Minio('play.min.io',
                     access_key='Q3AM3UQ867SPQQA43P2F',
                     secret_key='zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG',
                     secure=True)
diff --git a/README_zh_CN.md b/README_zh_CN.md
index d570ddfe..26462836 100644
--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@@ -39,7 +39,7 @@ MinIO client需要以下4个参数来连接MinIO对象存储服务。
 from minio import Minio
 from minio.error import ResponseError
 
-minioClient = Minio('play.min.io:9000',
+minioClient = Minio('play.min.io',
                   access_key='Q3AM3UQ867SPQQA43P2F',
                   secret_key='zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG',
                   secure=True)
@@ -49,7 +49,7 @@ minioClient = Minio('play.min.io:9000',
 ## 示例-文件上传
 本示例连接到一个MinIO对象存储服务，创建一个存储桶并上传一个文件到存储桶中。
 
-我们在本示例中使用运行在 [https://play.min.io:9000](https://play.min.io:9000) 上的MinIO服务，你可以用这个服务来开发和测试。示例中的访问凭据是公开的。
+我们在本示例中使用运行在 [https://play.min.io](https://play.min.io) 上的MinIO服务，你可以用这个服务来开发和测试。示例中的访问凭据是公开的。
 
 #### file-uploader.py
 
@@ -60,7 +60,7 @@ from minio.error import (ResponseError, BucketAlreadyOwnedByYou,
                          BucketAlreadyExists)
 
 # 使用endpoint、access key和secret key来初始化minioClient对象。
-minioClient = Minio('play.min.io:9000',
+minioClient = Minio('play.min.io',
                     access_key='Q3AM3UQ867SPQQA43P2F',
                     secret_key='zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG',
                     secure=True)
diff --git a/docs/API.md b/docs/API.md
index 053f366d..2d8a204d 100644
--- a/docs/API.md
+++ b/docs/API.md
@@ -8,7 +8,7 @@
 from minio import Minio
 from minio.error import ResponseError
 
-minioClient = Minio('play.min.io:9000',
+minioClient = Minio('play.min.io',
                   access_key='Q3AM3UQ867SPQQA43P2F',
                   secret_key='zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG',
                   secure=True)
@@ -71,7 +71,7 @@ __Example__
 from minio import Minio
 from minio.error import ResponseError
 
-minioClient = Minio('play.min.io:9000',
+minioClient = Minio('play.min.io',
                     access_key='Q3AM3UQ867SPQQA43P2F',
                     secret_key='zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG')
 ```
diff --git a/docs/zh_CN/API.md b/docs/zh_CN/API.md
index aaef9819..31474189 100644
--- a/docs/zh_CN/API.md
+++ b/docs/zh_CN/API.md
@@ -8,7 +8,7 @@
 from minio import Minio
 from minio.error import ResponseError
 
-minioClient = Minio('play.min.io:9000',
+minioClient = Minio('play.min.io',
                   access_key='Q3AM3UQ867SPQQA43P2F',
                   secret_key='zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG',
                   secure=True)
@@ -71,7 +71,7 @@ __示例__
 from minio import Minio
 from minio.error import ResponseError
 
-minioClient = Minio('play.min.io:9000',
+minioClient = Minio('play.min.io',
                     access_key='Q3AM3UQ867SPQQA43P2F',
                     secret_key='zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG')
 ```
diff --git a/examples/listen_notification.py b/examples/listen_notification.py
index 2646cf48..8a89f3d0 100644
--- a/examples/listen_notification.py
+++ b/examples/listen_notification.py
@@ -19,7 +19,7 @@
 
 from minio import Minio
 
-client = Minio('play.min.io:9000',
+client = Minio('play.min.io',
                access_key='Q3AM3UQ867SPQQA43P2F',
                secret_key='zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG')
 
diff --git a/minio/api.py b/minio/api.py
index c807f473..6bc0916e 100644
--- a/minio/api.py
+++ b/minio/api.py
@@ -119,11 +119,11 @@ class Minio(object):
     Constructs a :class:`Minio <Minio>`.
 
     Examples:
-        client = Minio('play.min.io:9000')
+        client = Minio('play.min.io')
         client = Minio('s3.amazonaws.com', 'ACCESS_KEY', 'SECRET_KEY')
 
         # To override auto bucket location discovery.
-        client = Minio('play.min.io:9000', 'ACCESS_KEY', 'SECRET_KEY',
+        client = Minio('play.min.io', 'ACCESS_KEY', 'SECRET_KEY',
                        region='us-east-1')
 
     :param endpoint: Hostname of the cloud storage server.
diff --git a/tests/functional/tests.py b/tests/functional/tests.py
index 2a21e000..d407492c 100644
--- a/tests/functional/tests.py
+++ b/tests/functional/tests.py
@@ -1758,9 +1758,9 @@ def main():
         access_key = os.getenv('ACCESS_KEY', 'Q3AM3UQ867SPQQA43P2F')
         secret_key = os.getenv('SECRET_KEY',
                                'zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG')
-        server_endpoint = os.getenv('SERVER_ENDPOINT', 'play.min.io:9000')
+        server_endpoint = os.getenv('SERVER_ENDPOINT', 'play.min.io')
         secure = os.getenv('ENABLE_HTTPS', '1') == '1'
-        if server_endpoint == 'play.min.io:9000':
+        if server_endpoint == 'play.min.io':
             access_key = 'Q3AM3UQ867SPQQA43P2F'
             secret_key = 'zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG'
             secure = True