diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..6c40395
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,9 @@
+sudo: false
+language: python
+dist: xenial
+python:
+  - "3.6"
+install: pip install tox-travis
+script:
+  - tox -c tox.ini -e pep8
+  - tox -c tox.ini -e py36
diff --git a/tox.ini b/tox.ini
index 6fcaae0..1bad802 100644
--- a/tox.ini
+++ b/tox.ini
@@ -31,4 +31,4 @@ commands = flake8 {posargs} zaza unit_tests
 commands = {posargs}
 
 [flake8]
-ignore = E402,E226
\ No newline at end of file
+ignore = E402,E226
diff --git a/zaza/model.py b/zaza/model.py
index d1803e3..db10db5 100644
--- a/zaza/model.py
+++ b/zaza/model.py
@@ -22,8 +22,8 @@ async def deployed(filter=None):
 def main():
     # Run the deploy coroutine in an asyncio event loop, using a helper
     # that abstracts loop creation and teardown.
-    print("Current applications: {}".format( ", ".join(loop.run(deployed()))))
+    print("Current applications: {}".format(", ".join(loop.run(deployed()))))
 
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()
diff --git a/zaza/tempest_config.py b/zaza/tempest_config.py
index a80ba96..24ad2d5 100644
--- a/zaza/tempest_config.py
+++ b/zaza/tempest_config.py
@@ -1,5 +1,4 @@
 import argparse
-import zaza
 
 
 def parser(args=None):
@@ -19,4 +18,4 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()