diff --git a/src/tests/com/puppycrawl/tools/checkstyle/SimplifyBooleanReturnCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/SimplifyBooleanReturnCheckTest.java
index d09a6fbcb..338dbeefa 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/SimplifyBooleanReturnCheckTest.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/SimplifyBooleanReturnCheckTest.java
@@ -15,8 +15,8 @@ public class SimplifyBooleanReturnCheckTest
     public void testIt()
             throws Exception
     {
-        final CheckConfiguration checkConfig = new CheckConfiguration();
-        checkConfig.setClassname(SimplifyBooleanReturnCheck.class.getName());
+        final DefaultConfiguration checkConfig =
+            createCheckConfig(SimplifyBooleanReturnCheck.class);
         final Checker c = createChecker(checkConfig);
         final String fname = getPath("InputSimplifyBoolean.java");
         final String[] expected = {
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/StaticVariableNameCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/StaticVariableNameCheckTest.java
index 58980e9b2..3576b7862 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/StaticVariableNameCheckTest.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/StaticVariableNameCheckTest.java
@@ -8,9 +8,9 @@ public class StaticVariableNameCheckTest
     public void testSpecified()
         throws Exception
     {
-        final CheckConfiguration checkConfig = new CheckConfiguration();
-        checkConfig.setClassname(StaticVariableNameCheck.class.getName());
-        checkConfig.addProperty("format", "^s[A-Z][a-zA-Z0-9]*$");
+        final DefaultConfiguration checkConfig =
+            createCheckConfig(StaticVariableNameCheck.class);
+        checkConfig.addAttribute("format", "^s[A-Z][a-zA-Z0-9]*$");
         final Checker c = createChecker(checkConfig);
         final String fname = getPath("InputSimple.java");
         final String[] expected = {
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/TabCharacterCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/TabCharacterCheckTest.java
index d8b20cec0..4be73de92 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/TabCharacterCheckTest.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/TabCharacterCheckTest.java
@@ -7,8 +7,8 @@ public class TabCharacterCheckTest
 {
     public void testIt() throws Exception
     {
-        final CheckConfiguration checkConfig = new CheckConfiguration();
-        checkConfig.setClassname(TabCharacterCheck.class.getName());
+        final DefaultConfiguration checkConfig =
+            createCheckConfig(TabCharacterCheck.class);
         final Checker c = createChecker(checkConfig);
         final String fname = getPath("InputSimple.java");
         final String[] expected = {
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/TodoCommentCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/TodoCommentCheckTest.java
index 347ac5745..3a0deebf6 100755
--- a/src/tests/com/puppycrawl/tools/checkstyle/TodoCommentCheckTest.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/TodoCommentCheckTest.java
@@ -8,9 +8,9 @@ public class TodoCommentCheckTest
     public void testIt()
             throws Exception
     {
-        final CheckConfiguration checkConfig = new CheckConfiguration();
-        checkConfig.setClassname(TodoCommentCheck.class.getName());
-        checkConfig.addProperty("format", "FIXME:");
+        final DefaultConfiguration checkConfig =
+            createCheckConfig(TodoCommentCheck.class);
+        checkConfig.addAttribute("format", "FIXME:");
         final Checker c = createChecker(checkConfig);
         final String fname = getPath("InputSimple.java");
         final String[] expected = {