diff --git a/hugolib/site.go b/hugolib/site.go
index f3d6dccff..bde869265 100644
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -1197,7 +1197,7 @@ func (s *Site) RenderHomePage() error {
 	n := s.newHomeNode()
 	layouts := s.appendThemeTemplates([]string{"index.html", "_default/list.html", "_default/single.html"})
 
-	if err := s.renderAndWritePage("homepage", "/", n, layouts...); err != nil {
+	if err := s.renderAndWritePage("homepage", helpers.FilePathSeparator, n, layouts...); err != nil {
 		return err
 	}
 
diff --git a/hugolib/site_test.go b/hugolib/site_test.go
index 92781ca18..ae52a6030 100644
--- a/hugolib/site_test.go
+++ b/hugolib/site_test.go
@@ -367,7 +367,7 @@ func doTest404ShouldAlwaysHaveUglyUrls(t *testing.T, uglyUrls bool) {
 	for _, test := range tests {
 		file, err := hugofs.DestinationFS.Open(test.doc)
 		if err != nil {
-			t.Fatalf("Did not find %s in target.", test.doc)
+			t.Fatalf("Did not find %s in target: %s", test.doc, err)
 		}
 		content := helpers.ReaderToBytes(file)