diff --git a/src/test/java/org/json/junit/JSONMLTest.java b/src/test/java/org/json/junit/JSONMLTest.java
index 8ece8e5..833e934 100644
--- a/src/test/java/org/json/junit/JSONMLTest.java
+++ b/src/test/java/org/json/junit/JSONMLTest.java
@@ -42,11 +42,11 @@ public class JSONMLTest {
         String xmlStr = "";
         try {
             JSONML.toJSONArray(xmlStr);
-            assertTrue("Expecting an exception", false);
+            fail("Expecting an exception");
         } catch (JSONException e) {
-            assertTrue("Expecting an exception message",
-                "Bad XML at 1 [character 2 line 1]".
-                equals(e.getMessage()));
+            assertEquals("Expecting an exception message",
+                "Bad XML at 0 [character 1 line 1]",
+                e.getMessage());
         }
     }
 
@@ -95,11 +95,11 @@ public class JSONMLTest {
         String xmlStr = "{ \"this is\": \"not xml\"}";
         try {
             JSONML.toJSONArray(xmlStr);
-            assertTrue("Expecting an exception", false);
+            fail("Expecting an exception");
         } catch (JSONException e) {
-            assertTrue("Expecting an exception message",
-                "Bad XML at 25 [character 26 line 1]".
-                equals(e.getMessage()));
+            assertEquals("Expecting an exception message",
+                "Bad XML at 23 [character 24 line 1]",
+                e.getMessage());
         }
     }
 
@@ -198,11 +198,11 @@ public class JSONMLTest {
             "</addresses>";
         try {
             JSONML.toJSONArray(xmlStr);
-            assertTrue("Expecting an exception", false);
+            fail("Expecting an exception");
         } catch (JSONException e) {
-            assertTrue("Expecting an exception message",
-                "Misshaped tag at 176 [character 14 line 7]".
-                equals(e.getMessage()));
+            assertEquals("Expecting an exception message",
+                "Misshaped tag at 176 [character 14 line 4]",
+                e.getMessage());
         }
     }
 
@@ -223,11 +223,11 @@ public class JSONMLTest {
             "</addresses>";
         try {
             JSONML.toJSONArray(xmlStr);
-            assertTrue("Expecting an exception", false);
+            fail("Expecting an exception");
         } catch (JSONException e) {
-            assertTrue("Expecting an exception message",
-                "Misshaped meta tag at 216 [character 13 line 11]".
-                equals(e.getMessage()));
+            assertEquals("Expecting an exception message",
+                "Misshaped meta tag at 216 [character 13 line 7]",
+                e.getMessage());
         }
     }
 
@@ -253,11 +253,11 @@ public class JSONMLTest {
             "</addresses>";
         try {
             JSONML.toJSONArray(xmlStr);
-            assertTrue("Expecting an exception", false);
+            fail("Expecting an exception");
         } catch (JSONException e) {
-            assertTrue("Expecting an exception message",
-                "Misshaped meta tag at 215 [character 13 line 11]".
-                equals(e.getMessage()));
+            assertEquals("Expecting an exception message",
+                "Misshaped meta tag at 215 [character 13 line 7]",
+                e.getMessage());
         }
     }
 
@@ -283,11 +283,11 @@ public class JSONMLTest {
             "</addresses>";
         try {
             JSONML.toJSONArray(xmlStr);
-            assertTrue("Expecting an exception", false);
+            fail("Expecting an exception");
         } catch (JSONException e) {
-            assertTrue("Expecting an exception message",
-                "Misplaced '<' at 194 [character 5 line 10]".
-                equals(e.getMessage()));
+            assertEquals("Expecting an exception message",
+                "Misplaced '<' at 194 [character 5 line 6]",
+                e.getMessage());
         }
     }
 
@@ -343,11 +343,11 @@ public class JSONMLTest {
             "</addresses>";
         try {
             JSONML.toJSONArray(xmlStr);
-            assertTrue("Expecting an exception", false);
+            fail("Expecting an exception");
         } catch (JSONException e) {
-            assertTrue("Expecting an exception message",
-                "Misplaced '<' at 206 [character 1 line 12]".
-                equals(e.getMessage()));
+            assertEquals("Expecting an exception message",
+                "Misplaced '<' at 206 [character 1 line 7]",
+                e.getMessage());
         }
     }
 
@@ -373,11 +373,11 @@ public class JSONMLTest {
             "</addresses>";
         try {
             JSONML.toJSONArray(xmlStr);
-            assertTrue("Expecting an exception", false);
+            fail("Expecting an exception");
         } catch (JSONException e) {
-            assertTrue("Expecting an exception message",
-                "Expected 'CDATA[' at 204 [character 11 line 9]".
-                equals(e.getMessage()));
+            assertEquals("Expecting an exception message",
+                "Expected 'CDATA[' at 204 [character 11 line 5]",
+                e.getMessage());
         }
     }
 
diff --git a/src/test/java/org/json/junit/XMLTest.java b/src/test/java/org/json/junit/XMLTest.java
index dd827bd..11566c6 100644
--- a/src/test/java/org/json/junit/XMLTest.java
+++ b/src/test/java/org/json/junit/XMLTest.java
@@ -3,6 +3,7 @@ package org.json.junit;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -74,11 +75,11 @@ public class XMLTest {
             "</addresses>";
         try {
             XML.toJSONObject(xmlStr);
-            assertTrue("Expecting a JSONException", false);
+            fail("Expecting a JSONException");
         } catch (JSONException e) {
-            assertTrue("Expecting an exception message",
-                    "Misshaped tag at 176 [character 14 line 5]".
-                    equals(e.getMessage()));
+            assertEquals("Expecting an exception message",
+                    "Misshaped tag at 176 [character 14 line 4]",
+                    e.getMessage());
         }
     }
 
@@ -99,11 +100,11 @@ public class XMLTest {
             "</addresses>";
         try {
             XML.toJSONObject(xmlStr);
-            assertTrue("Expecting a JSONException", false);
+            fail("Expecting a JSONException");
         } catch (JSONException e) {
-            assertTrue("Expecting an exception message",
-                    "Misshaped meta tag at 215 [character 13 line 8]".
-                    equals(e.getMessage()));
+            assertEquals("Expecting an exception message",
+                    "Misshaped meta tag at 215 [character 13 line 7]",
+                    e.getMessage());
         }
     }
 
@@ -124,11 +125,11 @@ public class XMLTest {
             "</addresses>";
         try {
             XML.toJSONObject(xmlStr);
-            assertTrue("Expecting a JSONException", false);
+            fail("Expecting a JSONException");
         } catch (JSONException e) {
-            assertTrue("Expecting an exception message",
-                    "Misshaped meta tag at 214 [character 13 line 8]".
-                    equals(e.getMessage()));
+            assertEquals("Expecting an exception message",
+                    "Misshaped meta tag at 214 [character 13 line 7]",
+                    e.getMessage());
         }
     }
 
@@ -149,11 +150,11 @@ public class XMLTest {
             "</addresses>";
         try {
             XML.toJSONObject(xmlStr);
-            assertTrue("Expecting a JSONException", false);
+            fail("Expecting a JSONException");
         } catch (JSONException e) {
-            assertTrue("Expecting an exception message",
-                    "Misplaced '<' at 193 [character 4 line 7]".
-                    equals(e.getMessage()));
+            assertEquals("Expecting an exception message",
+                    "Misplaced '<' at 193 [character 4 line 6]",
+                    e.getMessage());
         }
     }
 
@@ -174,11 +175,11 @@ public class XMLTest {
             "</addresses>";
         try {
             XML.toJSONObject(xmlStr);
-            assertTrue("Expecting a JSONException", false);
+            fail("Expecting a JSONException");
         } catch (JSONException e) {
-            assertTrue("Expecting an exception message",
-                    "Expected 'CDATA[' at 204 [character 11 line 6]".
-                    equals(e.getMessage()));
+            assertEquals("Expecting an exception message",
+                    "Expected 'CDATA[' at 204 [character 11 line 5]",
+                    e.getMessage());
         }
     }
 
@@ -397,9 +398,9 @@ public class XMLTest {
 
         final String expected = "<jo></jo>";
         String output1 = XML.toString(jo1,"jo");
-        assertTrue("Expected an empty root tag", expected.equals(output1));
+        assertEquals("Expected an empty root tag", expected, output1);
         String output2 = XML.toString(jo2,"jo");
-        assertTrue("Expected an empty root tag", expected.equals(output2));
+        assertEquals("Expected an empty root tag", expected, output2);
     }
     
     /**
@@ -414,9 +415,9 @@ public class XMLTest {
 
         final String expected = "<jo><arr>One</arr><arr></arr><arr>Four</arr></jo>";
         String output1 = XML.toString(jo1,"jo");
-        assertTrue("Expected a matching array", expected.equals(output1));
+        assertEquals("Expected a matching array", expected, output1);
         String output2 = XML.toString(jo2,"jo");
-        assertTrue("Expected a matching array", expected.equals(output2));
+        assertEquals("Expected a matching array", expected, output2);
     }
    
     /**
@@ -431,9 +432,9 @@ public class XMLTest {
 
         final String expected = "<jo><arr>One</arr><arr>Two</arr><arr>Three</arr></jo>";
         String output1 = XML.toString(jo1,"jo");
-        assertTrue("Expected a non empty root tag", expected.equals(output1));
+        assertEquals("Expected a non empty root tag", expected, output1);
         String output2 = XML.toString(jo2,"jo");
-        assertTrue("Expected a non empty root tag", expected.equals(output2));
+        assertEquals("Expected a non empty root tag", expected, output2);
     }
 
     /**
@@ -448,9 +449,9 @@ public class XMLTest {
 
         final String expected = "<jo><arr>One</arr><arr><array>Two</array><array>Three</array></arr><arr>Four</arr></jo>";
         String output1 = XML.toString(jo1,"jo");
-        assertTrue("Expected a matching array", expected.equals(output1));
+        assertEquals("Expected a matching array", expected, output1);
         String output2 = XML.toString(jo2,"jo");
-        assertTrue("Expected a matching array", expected.equals(output2));
+        assertEquals("Expected a matching array", expected, output2);
     }
 
     /**