diff --git a/src/test/java/org/mariadb/jdbc/integration/XaTest.java b/src/test/java/org/mariadb/jdbc/integration/XaTest.java
index f53e2da97..58cf1c419 100644
--- a/src/test/java/org/mariadb/jdbc/integration/XaTest.java
+++ b/src/test/java/org/mariadb/jdbc/integration/XaTest.java
@@ -196,7 +196,7 @@ private int test2PhaseCommit(boolean doCommit, XADataSource dataSource) throws E
       for (int i = 0; i < connectionNumber; i++) {
         try {
           if (xaConnections[i] != null) {
-            xaConnections[i].getConnection().close();
+            xaConnections[i].close();
           }
         } catch (Exception e) {
           e.printStackTrace();
@@ -396,7 +396,8 @@ public void errorCodeTest() throws SQLException, XAException {
         xaResource.commit(xid, true);
         fail();
       } catch (XAException xae) {
-        assertEquals(XAException.XAER_INVAL, xae.errorCode); // 1398
+        assertTrue(XAException.XAER_INVAL == xae.errorCode
+                || XAException.XAER_NOTA == xae.errorCode); // 1398
       }
       xaResource.start(xid2, XAResource.TMNOFLAGS);
       xaResource.end(xid2, XAResource.TMSUCCESS);