diff --git a/requirements.txt b/requirements.txt
index 9b29f12..4d1681c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,9 +4,9 @@
 
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
+oslo.concurrency>=3.26.0 # Apache-2.0
 oslo.config>=5.2.0 # Apache-2.0
 oslo.log>=3.36.0 # Apache-2.0
-oslo.concurrency>=3.26.0 # Apache-2.0
 oslo.policy>=1.35.0 # Apache-2.0
 oslo.messaging>=6.3.0 # Apache-2.0
 oslo.db>=4.27.0 # Apache-2.0
@@ -19,4 +19,4 @@ python-designateclient>=2.11.0 # Apache-2.0
 pecan!=1.0.2,!=1.0.3,!=1.0.4,!=1.2,>=1.0.0 # BSD
 PyMySQL>=0.7.6  # MIT License
 osprofiler>=1.5.0 # Apache-2.0
-WSME>=0.8  # MIT
+WSME>=0.8  # MIT
\ No newline at end of file
diff --git a/test-requirements.txt b/test-requirements.txt
index 2d8ca9b..cab8093 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,17 +5,19 @@
 hacking>=0.10.2,<0.11  # Apache-2.0
 
 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
+oslo.concurrency>=3.26.0 # Apache-2.0
 oslo.config>=5.2.0 # Apache-2.0
 oslo.log>=3.36.0 # Apache-2.0
-oslo.concurrency>=3.26.0 # Apache-2.0
 oslo.policy>=1.35.0 # Apache-2.0
 oslo.messaging>=6.3.0 # Apache-2.0
 oslo.db>=4.27.0 # Apache-2.0
 paramiko>=2.0.0  # LGPLv2.1+
 SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
 keystonemiddleware>=4.17.0 # Apache-2.0
-autobahn>=0.10.1  # MIT License
+autobahn>=18.10.1 # MIT License
 python-neutronclient>=6.7.0 # Apache-2.0
+python-designateclient>=2.11.0 # Apache-2.0
 pecan!=1.0.2,!=1.0.3,!=1.0.4,!=1.2,>=1.0.0 # BSD
 PyMySQL>=0.7.6  # MIT License
-WSME>=0.8  # MIT
+osprofiler>=1.5.0 # Apache-2.0
+WSME>=0.8  # MITMIT
diff --git a/tox.ini b/tox.ini
index 99020df..7952e99 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,12 +23,11 @@ basepython = python2.7
 commands = flake8 {posargs}
 
 [testenv:py35]
-basepython = python3.5
+basepython = python3
 
 
 [flake8]
 # TODO(dmllr): Analyze or fix the warnings blacklisted below
-# E711 comparison to None should be 'if cond is not None:'
 # E712 comparison to True should be 'if cond is True:' or 'if cond:'
 # H404 multi line docstring should start with a summary
 # H405 multi line docstring summary not separated with an empty line