diff --git a/.zuul.d/zuul.yaml b/.zuul.d/zuul.yaml
index 4f2edcc3..b08a66b1 100644
--- a/.zuul.d/zuul.yaml
+++ b/.zuul.d/zuul.yaml
@@ -45,6 +45,8 @@
         - rally-tox-pep8
         - rally-tox-py27
         - rally-tox-py35
+        - rally-tox-py36
+        - rally-tox-py37
         - rally-tox-cover
         - rally-docker-check
         - rally-task-simple-job
@@ -94,6 +96,8 @@
         - rally-tox-pep8
         - rally-tox-py27
         - rally-tox-py35
+        - rally-tox-py36
+        - rally-tox-py37
         - rally-tox-cover
         - rally-docker-check
         - rally-task-simple-job
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ecd8e568..cb261322 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -16,8 +16,19 @@ Changelog
 .. Release notes for existing releases are MUTABLE! If there is something that
    was missed or can be improved, feel free to change it!
 
-[unreleased] - 2018-07-20
--------------------------
+unreleased
+----------
+
+Added
+~~~~~
+
+* Support Python 3.7 environment.
+
+Changed
+~~~~~~~
+
+* Our requirements are updated as like upper-constraints (the list of
+  suggested tested versions to use)
 
 Removed
 ~~~~~~~
diff --git a/setup.cfg b/setup.cfg
index 1aef3755..025b5f47 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,6 +19,8 @@ classifier =
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.4
     Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
 
 [files]
 packages =
diff --git a/tests/unit/test_hacking.py b/tests/unit/test_hacking.py
index e15f5ef3..d38a90ba 100644
--- a/tests/unit/test_hacking.py
+++ b/tests/unit/test_hacking.py
@@ -10,6 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import sys
 import tokenize
 
 import ddt
@@ -21,6 +22,14 @@ from tests.unit import test
 
 @ddt.ddt
 class HackingTestCase(test.TestCase):
+    def setUp(self):
+        super(HackingTestCase, self).setUp()
+        # NOTE(andreykurilin): the current implementation of our hacking
+        #   rules with a magic method skip_ignored_lines fails due to
+        #   https://www.python.org/dev/peps/pep-0479/ rule which is enabled
+        #   on Python 3.7 env
+        if sys.version_info.major == 3 and sys.version_info.minor == 7:
+            self.skip("There is no need to check this at all envs.")
 
     def test__parse_assert_mock_str(self):
         pos, method, obj = checks._parse_assert_mock_str(
diff --git a/tox.ini b/tox.ini
index ce72e167..41898ad0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py35,py34,py27,pep8
+envlist = py27,py34,py35,py36,py37,pep8
 
 [testenv]
 extras = {env:RALLY_EXTRAS:}
@@ -42,6 +42,9 @@ basepython = python3.5
 [testenv:py36]
 basepython = python3.6
 
+[testenv:py37]
+basepython = python3.7
+
 
 [testenv:venv]
 commands = {posargs}
@@ -85,6 +88,7 @@ commands =
 
 [testenv:requirements]
 deps = requests[security]
+install_command = pip install -U {opts} {packages}
 commands = python {toxinidir}/tests/ci/sync_requirements.py {posargs}
 
 [flake8]