diff --git a/src/test/java/org/mybatis/spring/asyncsynchronization/AsyncAfterCompletionHelper.java b/src/test/java/org/mybatis/spring/asyncsynchronization/AsyncAfterCompletionHelper.java
index ec928f6655..6ad1f3d5df 100644
--- a/src/test/java/org/mybatis/spring/asyncsynchronization/AsyncAfterCompletionHelper.java
+++ b/src/test/java/org/mybatis/spring/asyncsynchronization/AsyncAfterCompletionHelper.java
@@ -66,9 +66,8 @@ public Object invoke(final Object proxy, final Method method, final Object[] arg
       thread.join();
       if (exceptionSet.isEmpty()) {
         return retValSet.iterator().next();
-      } else {
-        throw exceptionSet.iterator().next();
       }
+      throw exceptionSet.iterator().next();
     }
 
   }
diff --git a/src/test/java/org/mybatis/spring/batch/MyBatisCursorItemReaderTest.java b/src/test/java/org/mybatis/spring/batch/MyBatisCursorItemReaderTest.java
index 44f061ce62..965fa84336 100644
--- a/src/test/java/org/mybatis/spring/batch/MyBatisCursorItemReaderTest.java
+++ b/src/test/java/org/mybatis/spring/batch/MyBatisCursorItemReaderTest.java
@@ -90,12 +90,17 @@ private List<Object> getFoos() {
     return Arrays.asList(new Foo("foo1"), new Foo("foo2"), new Foo("foo3"));
   }
 
+  // Note: Do not cleanup this 'foo' class
   private static class Foo {
     private final String name;
 
     Foo(String name) {
       this.name = name;
     }
+
+    public String getName() {
+      return this.name;
+    }
   }
 
 }
diff --git a/src/test/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilderTest.java b/src/test/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilderTest.java
index 6076ba4da5..a39fc45e93 100644
--- a/src/test/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilderTest.java
+++ b/src/test/java/org/mybatis/spring/batch/builder/MyBatisBatchItemWriterBuilderTest.java
@@ -176,12 +176,17 @@ private Chunk<Foo> getFoos() {
     return Chunk.of(new Foo("foo1"), new Foo("foo2"), new Foo("foo3"));
   }
 
+  // Note: Do not cleanup this 'foo' class
   private static class Foo {
     private final String name;
 
     Foo(String name) {
       this.name = name;
     }
+
+    public String getName() {
+      return this.name;
+    }
   }
 
 }
diff --git a/src/test/java/org/mybatis/spring/submitted/xa/UserServiceImpl.java b/src/test/java/org/mybatis/spring/submitted/xa/UserServiceImpl.java
index 967d6a6c21..c98a1e1cd9 100644
--- a/src/test/java/org/mybatis/spring/submitted/xa/UserServiceImpl.java
+++ b/src/test/java/org/mybatis/spring/submitted/xa/UserServiceImpl.java
@@ -44,7 +44,7 @@ public void saveWithFailure(User user) {
 
   @Override
   public boolean checkUserExists(int id) {
-    if ((userMapperMaster.select(id) != null) || (userMapperSlave.select(id) != null)) {
+    if (userMapperMaster.select(id) != null || userMapperSlave.select(id) != null) {
       return true;
     }
     return false;