diff --git a/.travis.yml b/.travis.yml
index 59b545ae..1d38d0c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,14 +6,13 @@ services:
   - docker
 
 go:
-  - 1.6
   - 1.7
+  - 1.8
   - tip
 
 matrix:
   allow_failures:
     - go: tip
-    - go: 1.4
 
 install:
   - go get github.com/mattn/goveralls golang.org/x/tools/cmd/cover github.com/pierrre/gotestcover github.com/go-sql-driver/mysql github.com/lib/pq github.com/stretchr/testify/require github.com/stretchr/testify/assert
diff --git a/README.md b/README.md
index acaa4554..ba4cd4c0 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # [ory.am](https://ory.am)/dockertest
 
-[![Build Status](https://travis-ci.org/ory-am/dockertest.svg)](https://travis-ci.org/ory-am/dockertest?branch=master)
-[![Coverage Status](https://coveralls.io/repos/ory-am/dockertest/badge.svg?branch=master&service=github)](https://coveralls.io/github/ory-am/dockertest?branch=master)
+[![Build Status](https://travis-ci.org/ory/dockertest.svg)](https://travis-ci.org/ory/dockertest?branch=master)
+[![Coverage Status](https://coveralls.io/repos/ory/dockertest/badge.svg?branch=master&service=github)](https://coveralls.io/github/ory/dockertest?branch=master)
 
 Use Docker to run your Go language integration tests against third party services on **Microsoft Windows, Mac OSX and Linux**!