diff --git a/.travis.yml b/.travis.yml
index 57d9309..6c3c9b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,16 @@
 language: python
 python:
-  - "2.7"
-  - "3.5"
+ - "2.7"
+ - "3.6"
+addons:
+  apt:
+    packages:
+    - golang
+before_install:
+ - export GOPATH=~/go
+ - go get github.com/BurntSushi/toml-test
 install:
  - python setup.py install
+ - chmod +x ./tests/*.sh
 script:
- - python toml_test.py < examples/example-v0.4.0.toml
+ - ~/go/bin/toml-test ./tests/decoding_test.sh
diff --git a/tests/decoding_test.py b/tests/decoding_test.py
index f636d62..68055e9 100755
--- a/tests/decoding_test.py
+++ b/tests/decoding_test.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python2
 """Decodes toml and outputs it as tagged JSON""" 
 
 import datetime
diff --git a/tests/decoding_test.sh b/tests/decoding_test.sh
new file mode 100755
index 0000000..21f7439
--- /dev/null
+++ b/tests/decoding_test.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+python tests/decoding_test.py
\ No newline at end of file
diff --git a/tests/example_test.py b/tests/example_test.py
index 822f0ff..1500239 100755
--- a/tests/example_test.py
+++ b/tests/example_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 """Decodes toml and outputs it as JSON"""
 
 import toml_test