diff --git a/hugolib/template_test.go b/hugolib/template_test.go
index fa27dfc66..2690b172a 100644
--- a/hugolib/template_test.go
+++ b/hugolib/template_test.go
@@ -42,16 +42,9 @@ func TestBaseGoTemplate(t *testing.T) {
 				writeSource(t, fs, filepath.Join("layouts", "section", "sect-baseof.html"), `Base: {{block "main" .}}block{{end}}`)
 				writeSource(t, fs, filepath.Join("layouts", "section", "sect.html"), `{{define "main"}}sect{{ end }}`)
 
-				// See #2995
-				writeSource(t, fs, filepath.Join("layouts", "sect", "single.html"), `{{define "main"}}single sect{{ end }}`)
-
-				// Should not be picked.
-				writeSource(t, fs, filepath.Join("layouts", "_default", "baseof.html"), `Base: {{block "main" .}}NO{{end}}`)
-
 			},
 			func(t *testing.T) {
 				assertFileContent(t, fs, filepath.Join("public", "sect", "index.html"), false, "Base: sect")
-				assertFileContent(t, fs, filepath.Join("public", "sect", "page", "index.html"), false, "Base: single sect")
 			},
 		},
 		{
@@ -59,6 +52,7 @@ func TestBaseGoTemplate(t *testing.T) {
 			func(t *testing.T) {
 				writeSource(t, fs, filepath.Join("layouts", "baseof.html"), `Base: {{block "main" .}}block{{end}}`)
 				writeSource(t, fs, filepath.Join("layouts", "index.html"), `{{define "main"}}index{{ end }}`)
+
 			},
 			func(t *testing.T) {
 				assertFileContent(t, fs, filepath.Join("public", "index.html"), false, "Base: index")
@@ -94,16 +88,9 @@ func TestBaseGoTemplate(t *testing.T) {
 				writeSource(t, fs, filepath.Join("themes", "mytheme", "layouts", "section", "sect-baseof.html"), `Base Theme: {{block "main" .}}block{{end}}`)
 				writeSource(t, fs, filepath.Join("layouts", "section", "sect.html"), `{{define "main"}}sect{{ end }}`)
 
-				// See #2995
-				writeSource(t, fs, filepath.Join("themes", "mytheme", "layouts", "sect", "single.html"), `{{define "main"}}single sect{{ end }}`)
-
-				// Should not be picked.
-				writeSource(t, fs, filepath.Join("themes", "mytheme", "layouts", "_default", "baseof.html"), `Base: {{block "main" .}}NO{{end}}`)
-
 			},
 			func(t *testing.T) {
 				assertFileContent(t, fs, filepath.Join("public", "sect", "index.html"), false, "Base: sect")
-				assertFileContent(t, fs, filepath.Join("public", "sect", "page", "index.html"), false, "Base: single sect")
 			},
 		},
 		{
@@ -113,16 +100,9 @@ func TestBaseGoTemplate(t *testing.T) {
 				writeSource(t, fs, filepath.Join("themes", "mytheme", "layouts", "section", "sect-baseof.html"), `Base Theme: {{block "main" .}}block{{end}}`)
 				writeSource(t, fs, filepath.Join("layouts", "section", "sect.html"), `{{define "main"}}sect{{ end }}`)
 
-				// See #2995
-				writeSource(t, fs, filepath.Join("themes", "mytheme", "layouts", "sect", "single.html"), `{{define "main"}}single sect{{ end }}`)
-
-				// Should not be picked.
-				writeSource(t, fs, filepath.Join("themes", "mytheme", "layouts", "_default", "baseof.html"), `Base: {{block "main" .}}NO{{end}}`)
-
 			},
 			func(t *testing.T) {
 				assertFileContent(t, fs, filepath.Join("public", "sect", "index.html"), false, "Base Theme: sect")
-				assertFileContent(t, fs, filepath.Join("public", "sect", "page", "index.html"), false, "Base: single sect")
 			},
 		},
 		{