diff --git a/hugolib/node_as_page_test.go b/hugolib/node_as_page_test.go
index 19c374572..a4fd7830b 100644
--- a/hugolib/node_as_page_test.go
+++ b/hugolib/node_as_page_test.go
@@ -67,7 +67,7 @@ func TestNodesAsPage(t *testing.T) {
 	assertFileContent(t, filepath.Join("public", "index.html"), false,
 		"Index Title: Home Sweet Home!",
 		"Home <strong>Content!</strong>",
-		"# Pages: 9",
+		"# Pages: 4",
 		"Date: 2009-01-02",
 		"Lastmod: 2009-01-03",
 		"GetPage: Section1 ",
@@ -184,8 +184,8 @@ func TestNodesWithNoContentFile(t *testing.T) {
 	require.Len(t, homePages, 1)
 
 	homePage := homePages[0]
-	require.Len(t, homePage.Data["Pages"], 9)
-	require.Len(t, homePage.Pages, 9) // Alias
+	require.Len(t, homePage.Data["Pages"], 4)
+	require.Len(t, homePage.Pages, 4)
 	require.True(t, homePage.Path() == "")
 
 	assertFileContent(t, filepath.Join("public", "index.html"), false,
diff --git a/hugolib/page.go b/hugolib/page.go
index ec99e383c..6d549273c 100644
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -1466,7 +1466,7 @@ func (p *Page) prepareData(s *Site) error {
 	switch p.Kind {
 	case KindPage:
 	case KindHome:
-		pages = s.findPagesByKindNotIn(KindHome, s.Pages)
+		pages = s.RegularPages
 	case KindSection:
 		sectionData, ok := s.Sections[p.sections[0]]
 		if !ok {