diff --git a/.travis.yml b/.travis.yml
index ee00b08..7ba87db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ sudo: false
 python:
   - "2.7"
   - "3.4"
+  - "3.6"
 
 install:
   - pip install -r requirements.txt
@@ -20,5 +21,5 @@ deploy:
     secure: CiCAhkhxawA2/RjstP+Fg0oCEzIlRpsY8oPY7twLR00F2jKLmjvRwG+MiWoHYOabSzfiEC2gigMLlaYTqs367KenOvdDUySaMdtNDPF89rM47O/Fv1YKYjAAqvxK3EVUfxAJ3mYN1ybv4fLzqu8uInEGSKagziZQhoyRRvYkjagn36bNSuVTDKuhoc2QrKzYyh2CCG6HmNq4IQJKyvsOHdIznQs/HZR75SUeEsFUNyGMLDd+2H19hmaglLSnaW5z5m/21UgTkPu6aY1qP0JL8ob1HaAWgRy4iXrC7x+kauzuXyCU3QrK9vATghNFoy/9n5ILUaS9EANKQOWES/+jFVuQEJn3L6K62ABcB15x1yWG5g4jQ4FmoNNuDluli+d2Q1Bd1CbzaP6xz68tDITo53py9w3blPwYU8anMDsS6CoQvFyXOd2CDTOH/DRC6ziSyzSEnZ03+fRluVesPsEXO1BosbzomwA4P43y726bM7KPJLS/Me3jbqlee6mMOHjeB6nr9GzXSgQFqDFmZu0l75KRspt7unwnXKM9JJwLQme7VL+0lm28vBn1SjF+s46k2nyYazA3RPf6zD6fgVGqgfzHx/WyWF7CN05tJQaF+AgobYxda4UFvtP+1INNGfmJ2+5h//jvamydCHQ45zMdhRSn4YpQgn8mUXttZgtrfC4=
   on:
     tags: true
-    python: 3.4
+    python: 3.6
     repo: internap/python-ubersmith-remote-module-server
diff --git a/tests/Integration/test_router_ubersmith_core.py b/tests/Integration/test_router_ubersmith_core.py
index d3937c1..6253ce1 100644
--- a/tests/Integration/test_router_ubersmith_core.py
+++ b/tests/Integration/test_router_ubersmith_core.py
@@ -14,7 +14,12 @@
 
 import unittest
 
-from flexmock import flexmock, flexmock_teardown
+from flexmock import flexmock
+
+try:
+    from flexmock._api import flexmock_teardown
+except ImportError:
+    from flexmock import flexmock_teardown
 
 from . import ContextMatcher
 from ubersmith_remote_module_server import remote
diff --git a/tests/test_remote.py b/tests/test_remote.py
index 1e6aa79..1664a8f 100644
--- a/tests/test_remote.py
+++ b/tests/test_remote.py
@@ -14,7 +14,12 @@
 
 import unittest
 
-from flexmock import flexmock, flexmock_teardown
+from flexmock import flexmock
+
+try:
+    from flexmock._api import flexmock_teardown
+except ImportError:
+    from flexmock import flexmock_teardown
 
 from tests import mock_ubersmith_client, mock_ubersmith_api
 from ubersmith_remote_module_server import remote
diff --git a/tox.ini b/tox.ini
index 94771f2..21748b6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py34,pep8
+envlist = py27,py36,pep8
 
 [testenv]
 deps = -r{toxinidir}/test-requirements.txt