diff --git a/build/docker/scripts/cross-test.sh b/build/docker/scripts/cross-test.sh
index 0b6748ab254..3e9b3d185ae 100755
--- a/build/docker/scripts/cross-test.sh
+++ b/build/docker/scripts/cross-test.sh
@@ -2,7 +2,7 @@
 set -ev
 
 ./bootstrap.sh
-./configure --enable-tutorial=no
+./configure --enable-tutorial=no --with-cl=no --with-d=no --with-dart=no
 make -j3 precross
 
 set +e
@@ -10,7 +10,7 @@ make cross$1
 
 RET=$?
 if [ $RET -ne 0 ]; then
-  if [ -f "test/features/log/unexpected_failures.log" ]; then 
+  if [ -f "test/features/log/unexpected_failures.log" ]; then
     cat "test/features/log/unexpected_failures.log"
   fi
   if [ -f "test/log/unexpected_failures.log" ]; then
diff --git a/test/cpp/src/TestClient.cpp b/test/cpp/src/TestClient.cpp
index 41f5007e792..1163a76a5a5 100644
--- a/test/cpp/src/TestClient.cpp
+++ b/test/cpp/src/TestClient.cpp
@@ -668,6 +668,7 @@ int main(int argc, char** argv) {
     UUID_TEST(testUuid, TUuid{"5e2ab18817264e75a04f1ed9a6a89c4c"}, expected_uuid);
     UUID_TEST(testUuid, TUuid{"{5e2ab18817264e75a04f1ed9a6a89c4c}"}, expected_uuid);
     UUID_TEST(testUuid, TUuid{}, TUuid{"00000000-0000-0000-0000-000000000000"});
+    UUID_TEST(testUuid, TUuid{"00112233-4455-6677-8899-aabbccddeeff"}, TUuid{"00112233-4455-6677-8899-aabbccddeeff"});
 
     /**
      * STRUCT TEST
diff --git a/test/go/src/bin/testclient/main.go b/test/go/src/bin/testclient/main.go
index a71223ca602..643ad997243 100644
--- a/test/go/src/bin/testclient/main.go
+++ b/test/go/src/bin/testclient/main.go
@@ -152,6 +152,7 @@ func callEverything(client *thrifttest.ThriftTestClient) {
 		0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff,
 	}
 	u, err := client.TestUuid(defaultCtx, uout)
+	t.Printf("TestUuid(%v)", uout)
 	if err != nil {
 		t.Fatalf("TestUuid failed with %v", err)
 	}
diff --git a/test/swift/CrossTests/Sources/TestClient/main.swift b/test/swift/CrossTests/Sources/TestClient/main.swift
index d6274086942..650d34c9f27 100644
--- a/test/swift/CrossTests/Sources/TestClient/main.swift
+++ b/test/swift/CrossTests/Sources/TestClient/main.swift
@@ -384,7 +384,8 @@ Bân-lâm-gú, 粵語
    }*/
   
   func testUuid() throws {
-    let uuid = UUID()
+    let uuid = UUID(uuidString: "00112233-4455-6677-8899-aabbccddeeff")!
+    print("testUuid(\(uuid))")
     guard try client.testUuid(thing: uuid) == uuid else {
       resultCode |= Error.baseTypes.rawValue
       return