diff --git a/driver-core/src/test/resources/specifications b/driver-core/src/test/resources/specifications
index 668992950d9..28ffbc48d8e 160000
--- a/driver-core/src/test/resources/specifications
+++ b/driver-core/src/test/resources/specifications
@@ -1 +1 @@
-Subproject commit 668992950d975d3163e538849dd20383a214fc37
+Subproject commit 28ffbc48d8ea5238881752eced5160d76d132691
diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java
index 3cf703d6645..f658b7c5e01 100644
--- a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java
+++ b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java
@@ -176,6 +176,37 @@ public static void applyCustomizations(final TestDef def) {
                 .file("gridfs", "gridfs-deleteByName")
                 .file("gridfs", "gridfs-renameByName");
 
+        // Skip all rawData based tests
+        def.skipJira("https://jira.mongodb.org/browse/JAVA-5830 rawData support only added to Go and Node")
+                .file("collection-management", "listCollections-rawData")
+                .file("crud", "aggregate-rawData")
+                .file("crud", "aggregate-rawData")
+                .file("crud", "BulkWrite deleteMany-rawData")
+                .file("crud", "BulkWrite deleteOne-rawData")
+                .file("crud", "BulkWrite replaceOne-rawData")
+                .file("crud", "BulkWrite updateMany-rawData")
+                .file("crud", "BulkWrite updateOne-rawData")
+                .file("crud", "client bulkWrite delete-rawData")
+                .file("crud", "client bulkWrite replaceOne-rawData")
+                .file("crud", "client bulkWrite update-rawData")
+                .file("crud", "count-rawData")
+                .file("crud", "countDocuments-rawData")
+                .file("crud", "db-aggregate-rawdata")
+                .file("crud", "deleteMany-rawData")
+                .file("crud", "deleteOne-rawData")
+                .file("crud", "distinct-rawData")
+                .file("crud", "estimatedDocumentCount-rawData")
+                .file("crud", "find-rawData")
+                .file("crud", "findOneAndDelete-rawData")
+                .file("crud", "findOneAndReplace-rawData")
+                .file("crud", "findOneAndUpdate-rawData")
+                .file("crud", "insertMany-rawData")
+                .file("crud", "insertOne-rawData")
+                .file("crud", "replaceOne-rawData")
+                .file("crud", "updateMany-rawData")
+                .file("crud", "updateOne-rawData")
+                .file("index-management", "index management-rawData");
+
         // retryable-reads
 
         def.modify(WAIT_FOR_BATCH_CURSOR_CREATION, IGNORE_EXTRA_EVENTS)