diff --git a/.travis.yml b/.travis.yml
index d1f7eb3e..96e361fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,11 @@
+dist: xenial
 language: python
+python:
+  - "2.7"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "3.7"
 sudo: false
 services:
     - docker
@@ -6,7 +13,7 @@ before_install:
   - sudo apt-get update
   - sudo apt-get install -y libffi-dev libxml2-dev
 install:
-- pip install -U tox
+- pip install tox-travis
 - pip install -r will/requirements/dev.txt
 script:
 - tox
diff --git a/tox.ini b/tox.ini
index 8998c475..582d6121 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,15 +1,12 @@
 [tox]
-envlist = py27, 35, flake8
+envlist = py27, py34, py35, py36, py37
 
 
 [testenv]
-commands = 
-    python setup.py test
 deps =
     flake8
     sleekxmpp==1.3.2
     -rrequirements.txt
-
-[testenv:flake8]
-commands =
-    flake8
\ No newline at end of file
+commands = 
+    python setup.py test
+    flake8
diff --git a/will/backends/io_adapters/hipchat.py b/will/backends/io_adapters/hipchat.py
index 0bea6544..c9c52cb2 100644
--- a/will/backends/io_adapters/hipchat.py
+++ b/will/backends/io_adapters/hipchat.py
@@ -285,7 +285,7 @@ def start_xmpp_client(self, xmpp_bridge_queue=None, backend_name=""):
         else:
             for name, r in self.available_rooms.items():
                 if not hasattr(self, "default_room"):
-                        self.default_room = r
+                    self.default_room = r
                 self.rooms.append(r)
 
         self.nick = settings.HIPCHAT_HANDLE
diff --git a/will/main.py b/will/main.py
index 8f9506cc..c42b1b45 100644
--- a/will/main.py
+++ b/will/main.py
@@ -36,7 +36,7 @@
 
 # Force UTF8
 if sys.version_info < (3, 0):
-    reload(sys)  # flake8: noqa
+    reload(sys)  # noqa
     sys.setdefaultencoding('utf8')
 else:
     raw_input = input
@@ -562,9 +562,9 @@ def handle_sys_exit(self, *args, **kwargs):
             # or
             # ("hipchat" in settings.CHAT_BACKENDS and xmpp_thread and xmpp_thread.is_alive())
         ):
-                sys.stdout.write(".")
-                sys.stdout.flush()
-                time.sleep(0.5)
+            sys.stdout.write(".")
+            sys.stdout.flush()
+            time.sleep(0.5)
         print(". done.\n")
         sys.exit(1)
 
diff --git a/will/requirements/base.txt b/will/requirements/base.txt
index 04a51091..e1bc2420 100644
--- a/will/requirements/base.txt
+++ b/will/requirements/base.txt
@@ -19,10 +19,10 @@ pyasn1==0.1.7
 pycrypto==2.6.1
 pygerduty==0.28
 pytz==2017.2
-PyYAML==3.10
+PyYAML==3.13
 regex==2017.9.23
 redis==2.10.6
-requests==2.18.4
+requests==2.20.0
 six==1.10.0
 urllib3[secure]
-websocket-client==0.44.0
\ No newline at end of file
+websocket-client==0.44.0
diff --git a/will/utils.py b/will/utils.py
index 04136a4d..6fbbcb85 100644
--- a/will/utils.py
+++ b/will/utils.py
@@ -99,7 +99,7 @@ def note(warn_string):
 
 
 def print_head():
-        puts(r"""
+    puts(r"""
       ___/-\___
   ___|_________|___
      |         |