diff --git a/sdk1/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/encryption/DynamoDBEncryptorTest.java b/sdk1/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/encryption/DynamoDBEncryptorTest.java
index 6ec4aefd..32a22993 100644
--- a/sdk1/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/encryption/DynamoDBEncryptorTest.java
+++ b/sdk1/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/encryption/DynamoDBEncryptorTest.java
@@ -46,6 +46,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.TreeMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -198,7 +199,7 @@ public void ensureEncryptedAttributesUnmodified() throws GeneralSecurityExceptio
     Map<String, AttributeValue> encryptedAttributes =
         encryptor.encryptAllFieldsExcept(
             Collections.unmodifiableMap(attribs), context, "hashKey", "rangeKey", "version");
-    String encryptedString = encryptedAttributes.toString();
+    String encryptedString = new TreeMap<>(encryptedAttributes).toString();
     encryptor.decryptAllFieldsExcept(
         Collections.unmodifiableMap(encryptedAttributes),
         context,
@@ -206,7 +207,7 @@ public void ensureEncryptedAttributesUnmodified() throws GeneralSecurityExceptio
         "rangeKey",
         "version");
 
-    assertEquals(encryptedString, encryptedAttributes.toString());
+    assertEquals(encryptedString, new TreeMap<>(encryptedAttributes).toString());
   }
 
   @Test(expectedExceptions = SignatureException.class)
diff --git a/sdk1/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/internal/AttributeValueMarshallerTest.java b/sdk1/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/internal/AttributeValueMarshallerTest.java
index 523a1958..904624e4 100644
--- a/sdk1/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/internal/AttributeValueMarshallerTest.java
+++ b/sdk1/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/internal/AttributeValueMarshallerTest.java
@@ -266,9 +266,12 @@ public void testSimpleMapWithNull() {
       marshall(av);
       Assert.fail("Unexpected success");
     } catch (final NullPointerException npe) {
-      Assert.assertEquals(
-          "Encountered null map value for key NullKeyValue while marshalling attribute value {M: {KeyValue={S: ValueValue,}, NullKeyValue=null},}",
-          npe.getMessage());
+      // Map entries may permute under nondeterministic Java API
+      String npeMessage = npe.getMessage();
+      String common = "Encountered null map value for key NullKeyValue while marshalling attribute value ";
+      String case1 = common + "{M: {KeyValue={S: ValueValue,}, NullKeyValue=null},}";
+      String case2 = common + "{M: {NullKeyValue=null, KeyValue={S: ValueValue,}},}";
+      Assert.assertTrue(case1.equals(npeMessage) || case2.equals(npeMessage));
     }
   }