diff --git a/build.xml b/build.xml
index bb9d2d395..2d223956c 100644
--- a/build.xml
+++ b/build.xml
@@ -12,7 +12,7 @@
   <property name="antlr.jar" value="lib/antlr.jar" />
   <property name="velocity.jar" value="lib/velocity-dep-1.4.jar" />
   <property name="jdom.jar" value="lib/jdom-b9.jar" />
-  <property name="junit.jar" value="lib/junit.jar" />
+  <property name="junit.jar" value="lib/junit-4.4.jar" />
   <property name="beanutils.jar" value="lib/commons-beanutils-core.jar" />
   <property name="collections.jar" value="lib/commons-collections.jar" />
   <property name="cli.jar" value="lib/commons-cli.jar" />
@@ -364,18 +364,6 @@
            style="contrib/checkstyle-author.xsl"/>
   </target>
 
-  <!-- Targets to verify that JUnit is in the classpath -->
-  <target name="-check.junit"
-          description="Checks whether JUnit is in the classpath">
-    <available property="have.junit"
-               classname="junit.framework.TestListener"/>
-  </target>
-
-  <target name="-require.junit" depends="-check.junit" unless="have.junit"
-          description="Fails if JUnit is not present in the classpath">
-    <fail message="Need to have JUnit in your CLASSPATH to run the tests. Consider using the one in the lib directory."/>
-  </target>
-
   <!-- Targets to verify that Xalan is in the classpath -->
   <target name="-check.xalan"
           description="Checks whether xalan is in the classpath">
@@ -416,12 +404,13 @@ For users of JDK 1.5 at least version 1.6.2 of Ant is required.
 
   <!-- To run the tests need Xalan in the classpath -->
   <target name="run.tests"
-          depends="compile.tests,-require.ant15,-require.junit,-require.xalan,compile.testinputs"
+          depends="compile.tests,-require.ant17,-require.xalan,compile.testinputs"
           description="Runs the tests for checkstyle">
 
     <mkdir dir="${testreport.dir}"/>
     <property name="testinputs.dir"
               location="${basedir}/src/testinputs/com/puppycrawl/tools/checkstyle"/>
+    <echo>testinputs.dir = ${testinputs.dir}</echo>
 
     <junit printsummary="yes"
            fork="yes"
@@ -677,21 +666,19 @@ For users of JDK 1.5 at least version 1.6.2 of Ant is required.
     </xmlvalidate>
   </target>
 
-  <!-- Targets to verify that ANT version if at least 1.5 -->
-  <target name="-check.ant15">
+  <!-- Targets to verify that ANT version if at least 1.7 -->
+  <target name="-check.ant17">
     <echo>version is ${ant.version}</echo>
-    <condition property="have.ant15">
-      <not>
-        <or>
-          <equals arg1="${ant.version}"
-                  arg2="Ant version 1.4.1 compiled on October 11 2001"/>
-        </or>
-      </not>
+    <condition property="have.ant17">
+      <or>
+        <equals arg1="${ant.version}"
+                arg2="Apache Ant version 1.7.0 compiled on December 13 2006"/>
+      </or>
     </condition>
   </target>
 
-  <target name="-require.ant15" depends="-check.ant15" unless="have.ant15">
-    <fail message="Need at least version 1.5 of ANT - you have ${ant.version}"/>
+  <target name="-require.ant17" depends="-check.ant17" unless="have.ant17">
+    <fail message="Need at least version 1.7 of ANT - you have ${ant.version}"/>
   </target>
 
   <target name="checkstyle.run" depends="compile.checkstyle"
diff --git a/lib/junit-4.4.jar b/lib/junit-4.4.jar
new file mode 100644
index 000000000..649b0b327
Binary files /dev/null and b/lib/junit-4.4.jar differ
diff --git a/lib/junit.jar b/lib/junit.jar
deleted file mode 100644
index 674d71e89..000000000
Binary files a/lib/junit.jar and /dev/null differ
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/CheckerTest.java b/src/tests/com/puppycrawl/tools/checkstyle/CheckerTest.java
index 746113773..e879f4ec0 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/CheckerTest.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/CheckerTest.java
@@ -1,14 +1,12 @@
 package com.puppycrawl.tools.checkstyle;
 
-import java.io.File;
-
-import junit.framework.TestCase;
-
 import com.puppycrawl.tools.checkstyle.api.AuditEvent;
 import com.puppycrawl.tools.checkstyle.api.AuditListener;
 import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
 import com.puppycrawl.tools.checkstyle.api.Filter;
 import com.puppycrawl.tools.checkstyle.api.LocalizedMessage;
+import java.io.File;
+import junit.framework.TestCase;
 
 public class CheckerTest extends TestCase
 {
@@ -33,9 +31,7 @@ public class CheckerTest extends TestCase
         }
 
         c.setBasedir(testinputs_dir + "indentation/./..\\coding\\");
-
-
-        assertEquals(testinputs_dir + "coding", c.getBasedir());
+        assertTrue((testinputs_dir + "coding").equalsIgnoreCase(c.getBasedir()));
     }
 
 
@@ -225,11 +221,13 @@ class DebugChecker extends Checker
         super();
     }
 
+    @Override
     public void fireAuditFinished()
     {
         super.fireAuditFinished();
     }
 
+    @Override
     public void fireAuditStarted()
     {
         super.fireAuditStarted();
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/api/AutomaticBeanTest.java b/src/tests/com/puppycrawl/tools/checkstyle/api/AutomaticBeanTest.java
index 4732dadf3..c7cd1a264 100644
--- a/src/tests/com/puppycrawl/tools/checkstyle/api/AutomaticBeanTest.java
+++ b/src/tests/com/puppycrawl/tools/checkstyle/api/AutomaticBeanTest.java
@@ -1,9 +1,9 @@
 package com.puppycrawl.tools.checkstyle.api;
 
 import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
-import junit.framework.TestCase;
+import org.junit.Test;
 
-public class AutomaticBeanTest extends TestCase
+public class AutomaticBeanTest
 {
     private class TestBean extends AutomaticBean
     {
@@ -15,27 +15,15 @@ public class AutomaticBeanTest extends TestCase
         }
     }
 
-    DefaultConfiguration mConf = null;
+    private final DefaultConfiguration mConf = new DefaultConfiguration(
+            "testConf");
 
     TestBean mTestBean = new TestBean();
 
-    public void setUp()
-    {
-        mConf = new DefaultConfiguration("testConf");
-    }
-
-    public void testNoSuchAttribute()
+    @Test(expected = CheckstyleException.class)
+    public void testNoSuchAttribute() throws CheckstyleException
     {
         mConf.addAttribute("NonExisting", "doesn't matter");
-        try {
-            mTestBean.configure(mConf);
-            fail("AutomaticBean.configure() accepted nonexisting attribute name");
-        }
-        catch (CheckstyleException ex)
-        {
-            // expected exception
-        }
-        assertEquals(mTestBean.mName, null);
-
+        mTestBean.configure(mConf);
     }
 }