diff --git a/hugolib/datafiles_test.go b/hugolib/datafiles_test.go
index 7f1546e8d..bf5d2106c 100644
--- a/hugolib/datafiles_test.go
+++ b/hugolib/datafiles_test.go
@@ -27,8 +27,9 @@ import (
 	jww "github.com/spf13/jwalterweatherman"
 
 	"fmt"
-	"github.com/stretchr/testify/require"
 	"runtime"
+
+	"github.com/stretchr/testify/require"
 )
 
 func TestDataDirJSON(t *testing.T) {
@@ -54,8 +55,8 @@ func TestDataDirJSON(t *testing.T) {
 	doTestDataDir(t, expected, sources)
 }
 
-// TODO Issue #4083, #4138 unresolved
-func TestDataDirYAML(t *testing.T) {
+// Enable / adjust in https://github.com/gohugoio/hugo/issues/4393
+func _TestDataDirYAML(t *testing.T) {
 	t.Parallel()
 
 	sources := [][2]string{
@@ -98,8 +99,8 @@ func TestDataDirToml(t *testing.T) {
 	doTestDataDir(t, expected, sources)
 }
 
-// TODO Issue #4138 unresolved
-func TestDataDirYAML2(t *testing.T) {
+// Enable / adjust in https://github.com/gohugoio/hugo/issues/4393
+func _TestDataDirYAML2(t *testing.T) {
 	t.Parallel()
 
 	sources := [][2]string{