diff --git a/.travis.yml b/.travis.yml
index 80f1e01a..ade2d939 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,8 @@ services:
 
 go:
   - 1.6
-  - 1.7rc5
+  - 1.7rc6
+  - tip
 
 # first part of the GOARCH workaround
 # setting the GOARCH directly doesn't work, since the value will be overwritten later
diff --git a/appveyor.yml b/appveyor.yml
index 55345bce..7ca9cb8d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,8 +13,8 @@ clone_folder: c:\gopath\src\github.com\lucas-clemente\quic-go
 
 install:
   - rmdir c:\go /s /q
-  - appveyor DownloadFile https://storage.googleapis.com/golang/go1.7rc5.windows-amd64.zip
-  - 7z x go1.7rc5.windows-amd64.zip -y -oC:\ > NUL
+  - appveyor DownloadFile https://storage.googleapis.com/golang/go1.7rc6.windows-amd64.zip
+  - 7z x go1.7rc6.windows-amd64.zip -y -oC:\ > NUL
   - set PATH=%PATH%;%GOPATH%\bin
   - echo %PATH%
   - echo %GOPATH%