diff --git a/hugolib/resource_chain_test.go b/hugolib/resource_chain_test.go
index 9e8991d8d..045c9517a 100644
--- a/hugolib/resource_chain_test.go
+++ b/hugolib/resource_chain_test.go
@@ -257,7 +257,10 @@ T2: Content: {{ $combinedText.Content }}|{{ $combinedText.RelPermalink }}
 			b.AssertFileContent("public/rocks/hugo.txt", "Hugo Rocks!")
 
 		}},
-		{"execute-as-template", func() bool { return true }, func(b *sitesBuilder) {
+		{"execute-as-template", func() bool {
+			// TODO(bep) eventually remove
+			return isGo111()
+		}, func(b *sitesBuilder) {
 			b.WithTemplates("home.html", `
 {{ $var := "Hugo Page" }}
 {{ if .IsHome }}
diff --git a/hugolib/testhelpers_test.go b/hugolib/testhelpers_test.go
index ec84449ec..27edf3fdd 100644
--- a/hugolib/testhelpers_test.go
+++ b/hugolib/testhelpers_test.go
@@ -676,3 +676,7 @@ func dumpPages(pages ...*Page) {
 func isCI() bool {
 	return os.Getenv("CI") != ""
 }
+
+func isGo111() bool {
+	return strings.Contains(runtime.Version(), "1.11")
+}