diff --git a/.travis.yml b/.travis.yml
index 970c4a7a2..469e9c29c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+dist: xenial   # required for Python >= 3.7
 language: python
 
 python:
@@ -5,6 +6,7 @@ python:
 - '3.4'
 - '3.5'
 - '3.6'
+- '3.7'
 
 os:
 - linux
diff --git a/minio/copy_conditions.py b/minio/copy_conditions.py
index fabfdded3..82f158826 100644
--- a/minio/copy_conditions.py
+++ b/minio/copy_conditions.py
@@ -25,6 +25,10 @@
 """
 
 import collections
+try:
+    collectionsAbc = collections.abc
+except AttributeError:
+    collectionsAbc = collections
 from .helpers import is_non_empty_string
 
 # CopyCondition explanation:
@@ -36,7 +40,7 @@
 #      key: "x-amz-copy-if-modified-since",
 #      value: "Tue, 15 Nov 1994 12:45:26 GMT",
 #
-class CopyConditions(collections.MutableMapping):
+class CopyConditions(collectionsAbc.MutableMapping):
     """
     A :class:`CopyConditions <CopyConditions>` collection of
        supported CopyObject conditions.
diff --git a/minio/helpers.py b/minio/helpers.py
index 9151b93f0..b4f08d877 100644
--- a/minio/helpers.py
+++ b/minio/helpers.py
@@ -53,7 +53,7 @@
 
 _VALID_BUCKETNAME_REGEX = re.compile('^[a-z0-9][a-z0-9\\.\\-]+[a-z0-9]$')
 _ALLOWED_HOSTNAME_REGEX = re.compile(
-    '^((?!-)(?!_)[A-Z\_\\d-]{1,63}(?<!-)(?<!_)\\.)*((?!_)(?!-)[A-Z\_\\d-]{1,63}(?<!-)(?<!_))$',
+    '^((?!-)(?!_)[A-Z_\\d-]{1,63}(?<!-)(?<!_)\\.)*((?!_)(?!-)[A-Z_\\d-]{1,63}(?<!-)(?<!_))$',
     re.IGNORECASE)
 
 _EXTRACT_REGION_REGEX = re.compile('s3[.-]?(.+?).amazonaws.com')
diff --git a/setup.py b/setup.py
index f46a6eb71..d60b2c9a2 100644
--- a/setup.py
+++ b/setup.py
@@ -77,6 +77,7 @@
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
     long_description=readme,