diff --git a/.travis.yml b/.travis.yml
index c5bd4f8..9843ea0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,10 @@ language: python
 python:
 - '2.7'
 - '3.5'
+- '3.6'
 before_install: sudo apt-get install unzip
 before_script:
-  - export TFVER=0.8.1
+  - export TFVER=0.9.5
   - export TFURL=https://releases.hashicorp.com/terraform/
   - TFURL+=$TFVER
   - TFURL+="/terraform_"
diff --git a/tox.ini b/tox.ini
index 9d0b810..1f9a9cd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 # content of: tox.ini , put in same dir as setup.py
 [tox]
-envlist = py27, py35
+envlist = py27, py35, py36
 [testenv]
 deps=pytest
 commands=py.test test
@@ -8,4 +8,5 @@ commands=py.test test
 [travis]
 python =
   2.7: py27
-  3.5: py35
\ No newline at end of file
+  3.5: py35
+  3.6: py36
\ No newline at end of file