diff --git a/hugolib/config_test.go b/hugolib/config_test.go
index c4a373232..567059e68 100644
--- a/hugolib/config_test.go
+++ b/hugolib/config_test.go
@@ -1299,7 +1299,6 @@ Home.
 func TestDefaultContentLanguageInSubdirOnlyOneLanguage(t *testing.T) {
 
 	t.Run("One language, default in sub dir", func(t *testing.T) {
-		t.Skip()
 		t.Parallel()
 
 		files := `
@@ -1325,7 +1324,6 @@ Home.
 	})
 
 	t.Run("Two languages, default in sub dir", func(t *testing.T) {
-		t.Skip()
 		t.Parallel()
 
 		files := `
diff --git a/hugolib/paths/paths.go b/hugolib/paths/paths.go
index b0d9e3c1b..817670dbd 100644
--- a/hugolib/paths/paths.go
+++ b/hugolib/paths/paths.go
@@ -102,9 +102,8 @@ func (p *Paths) Lang() string {
 	return p.Cfg.Language().Lang
 }
 
-// TODO1 check this.
 func (p *Paths) GetTargetLanguageBasePath() string {
-	if len(p.Cfg.Languages()) > 1 {
+	if p.Cfg.IsMultihost() {
 		// In a multihost configuration all assets will be published below the language code.
 		return p.Lang()
 	}