diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts
index 6672672a..adf35a88 100644
--- a/.teamcity/settings.kts
+++ b/.teamcity/settings.kts
@@ -38,20 +38,25 @@ val targets = arrayOf(
 	"linux/amd64/1.14",
         "linux/amd64/1.15",
         "linux/amd64/1.16",
+        "linux/amd64/1.17",
         "linux/amd64/tip",
 
         "linux/386/1.16",
 
         "linux/arm64/1.16",
+        "linux/arm64/1.17",
         "linux/arm64/tip",
 
         "windows/amd64/1.16",
+        "windows/amd64/1.17"
         "windows/amd64/tip",
 
         "mac/amd64/1.16",
+        "mac/amd64/1.17",
         "mac/amd64/tip",
 
         "mac/arm64/1.16",
+        "mac/arm64/1.17",
         "mac/arm64/tip"
 )
 
diff --git a/_scripts/test_linux.sh b/_scripts/test_linux.sh
index 345daf3a..2125af5f 100755
--- a/_scripts/test_linux.sh
+++ b/_scripts/test_linux.sh
@@ -20,7 +20,7 @@ function getgo {
 }
 
 if [ "$version" = "gotip" ]; then
-	#exit 0
+	exit 0
 	echo Building Go from tip
 	getgo $(curl https://golang.org/VERSION?m=text)
 	export GOROOT_BOOTSTRAP=$GOROOT
diff --git a/_scripts/test_mac.sh b/_scripts/test_mac.sh
index 4a65f7e3..a9a43fbe 100644
--- a/_scripts/test_mac.sh
+++ b/_scripts/test_mac.sh
@@ -8,7 +8,7 @@ ARCH=$2
 TMPDIR=$3
 
 if [ "$GOVERSION" = "gotip" ]; then
-    #exit 0
+    exit 0
     bootstrapver=$(curl https://golang.org/VERSION?m=text)
     cd $TMPDIR
     curl -sSL "https://storage.googleapis.com/golang/$bootstrapver.darwin-$ARCH.tar.gz" | tar -xz
diff --git a/_scripts/test_windows.ps1 b/_scripts/test_windows.ps1
index 7c4b45d3..7d814b67 100644
--- a/_scripts/test_windows.ps1
+++ b/_scripts/test_windows.ps1
@@ -32,7 +32,7 @@ function GetGo($version) {
 }
 
 if ($version -eq "gotip") {
-    #Exit 0
+    Exit 0
     $latest = Invoke-WebRequest -Uri https://golang.org/VERSION?m=text -UseBasicParsing | Select-Object -ExpandProperty Content
     GetGo $latest
     $env:GOROOT_BOOTSTRAP = $env:GOROOT