diff --git a/encoding/openapi/testdata/embed-norefs.txtar b/encoding/openapi/testdata/embed-norefs.txtar
index e291b09ce..106775fb6 100644
--- a/encoding/openapi/testdata/embed-norefs.txtar
+++ b/encoding/openapi/testdata/embed-norefs.txtar
@@ -1,5 +1,4 @@
 #ExpandReferences
-#skip-v3
 -- in.cue --
 #Foo: string
 
diff --git a/encoding/openapi/testdata/struct.txtar b/encoding/openapi/testdata/struct.txtar
index 5b1bbf97c..f94b59e9d 100644
--- a/encoding/openapi/testdata/struct.txtar
+++ b/encoding/openapi/testdata/struct.txtar
@@ -1,4 +1,3 @@
-#skip-v3
 -- in.cue --
 import "struct"
 
diff --git a/encoding/openapi/testdata/structural.txtar b/encoding/openapi/testdata/structural.txtar
index eac3c6f0c..19998d5ac 100644
--- a/encoding/openapi/testdata/structural.txtar
+++ b/encoding/openapi/testdata/structural.txtar
@@ -1,5 +1,4 @@
 #ExpandReferences
-#skip-v3
 -- in.cue --
 import "time"
 
diff --git a/internal/core/adt/composite.go b/internal/core/adt/composite.go
index 1f6120f15..cd341b47e 100644
--- a/internal/core/adt/composite.go
+++ b/internal/core/adt/composite.go
@@ -760,6 +760,7 @@ func (v *Vertex) IsData() bool {
 // of this vertex. Arcs are left untouched.
 // It is used by cue.Eval to convert nodes to data on per-node basis.
 func (v *Vertex) ToDataSingle() *Vertex {
+	v = v.DerefValue()
 	w := *v
 	w.isData = true
 	w.state = nil