diff --git a/src/testinputs/com/puppycrawl/tools/checkstyle/import-control_broken.xml b/src/testinputs/com/puppycrawl/tools/checkstyle/import-control_broken.xml
new file mode 100755
index 000000000..02f9b152d
--- /dev/null
+++ b/src/testinputs/com/puppycrawl/tools/checkstyle/import-control_broken.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE import-control PUBLIC
+    "-//Puppy Crawl//DTD Import Control 1.0//EN"
+    "http://www.puppycrawl.com/dtds/import_control_1_0.dtd">
+
+<import-control>
+</import-control>
diff --git a/src/testinputs/com/puppycrawl/tools/checkstyle/import-control_one.xml b/src/testinputs/com/puppycrawl/tools/checkstyle/import-control_one.xml
new file mode 100755
index 000000000..869dc6565
--- /dev/null
+++ b/src/testinputs/com/puppycrawl/tools/checkstyle/import-control_one.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE import-control PUBLIC
+    "-//Puppy Crawl//DTD Import Control 1.0//EN"
+    "http://www.puppycrawl.com/dtds/import_control_1_0.dtd">
+
+<import-control pkg="com.puppycrawl.tools.checkstyle">
+  <allow class="java.awt.Image"/>
+  <allow class="java.io.File" local-only="selected"/>
+  <subpackage name="imports">
+    <allow pkg="javax.swing"/>
+  </subpackage>
+</import-control>
diff --git a/src/testinputs/com/puppycrawl/tools/checkstyle/import-control_two.xml b/src/testinputs/com/puppycrawl/tools/checkstyle/import-control_two.xml
new file mode 100755
index 000000000..1ae5264d8
--- /dev/null
+++ b/src/testinputs/com/puppycrawl/tools/checkstyle/import-control_two.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE import-control PUBLIC
+    "-//Puppy Crawl//DTD Import Control 1.0//EN"
+    "http://www.puppycrawl.com/dtds/import_control_1_0.dtd">
+
+<import-control pkg="com.puppycrawl.tools.checkstyle">
+  <allow class="java.awt.Image"/>
+  <allow class="java.io.File" local-only="selected"/>
+  <subpackage name="imports">
+    <disallow class="java.awt.Image" local-only="selected"/>
+    <allow pkg="javax.swing" exact-match="selected"/>
+    <allow pkg="java.io" exact-match="selected" local-only="selected"/>
+  </subpackage>
+</import-control>
diff --git a/src/testinputs/com/puppycrawl/tools/checkstyle/imports/InputImportControl.java b/src/testinputs/com/puppycrawl/tools/checkstyle/imports/InputImportControl.java
new file mode 100755
index 000000000..c9b79b33d
--- /dev/null
+++ b/src/testinputs/com/puppycrawl/tools/checkstyle/imports/InputImportControl.java
@@ -0,0 +1,10 @@
+package com.puppycrawl.tools.checkstyle.imports;
+
+import java.awt.Image;
+import javax.swing.border.*;
+import java.io.File;
+
+public class InputImportControl
+{
+
+}
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheckTest.java b/src/tests/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheckTest.java
new file mode 100755
index 000000000..107d078a4
--- /dev/null
+++ b/src/tests/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheckTest.java
@@ -0,0 +1,80 @@
+package com.puppycrawl.tools.checkstyle.checks.imports;
+
+import com.puppycrawl.tools.checkstyle.BaseCheckTestCase;
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
+import java.io.File;
+
+public class ImportControlCheckTest extends BaseCheckTestCase
+{
+    public void testOne() throws Exception
+    {
+        final DefaultConfiguration checkConfig = createCheckConfig(ImportControlCheck.class);
+        checkConfig.addAttribute("file", System.getProperty("testinputs.dir")
+                + "/import-control_one.xml");
+        final String[] expected = {"5:1: Disallowed import - java.io.File."};
+
+        verify(checkConfig, getPath("imports" + File.separator
+                + "InputImportControl.java"), expected);
+    }
+
+    public void testTwo() throws Exception
+    {
+        final DefaultConfiguration checkConfig = createCheckConfig(ImportControlCheck.class);
+        checkConfig.addAttribute("file", System.getProperty("testinputs.dir")
+                + "/import-control_two.xml");
+        final String[] expected = {"3:1: Disallowed import - java.awt.Image.",
+                "4:1: Disallowed import - javax.swing.border.*."};
+
+        verify(checkConfig, getPath("imports" + File.separator
+                + "InputImportControl.java"), expected);
+    }
+
+    public void testMissing() throws Exception
+    {
+        final DefaultConfiguration checkConfig = createCheckConfig(ImportControlCheck.class);
+        final String[] expected = {"1:40: Missing an import control file."};
+        verify(checkConfig, getPath("imports" + File.separator
+                + "InputImportControl.java"), expected);
+    }
+
+    public void testEmpty() throws Exception
+    {
+        final DefaultConfiguration checkConfig = createCheckConfig(ImportControlCheck.class);
+        checkConfig.addAttribute("file", "   ");
+        final String[] expected = {"1:40: Missing an import control file."};
+        verify(checkConfig, getPath("imports" + File.separator
+                + "InputImportControl.java"), expected);
+    }
+
+    public void testWrong() throws Exception
+    {
+        final DefaultConfiguration checkConfig = createCheckConfig(ImportControlCheck.class);
+        checkConfig.addAttribute("file", "unknown-file");
+        final String[] expected = {};
+        try {
+            verify(checkConfig, getPath("imports" + File.separator
+                    + "InputImportControl.java"), expected);
+            fail("should fail");
+        }
+        catch (CheckstyleException ex) {
+            ;
+        }
+    }
+
+    public void testBroken() throws Exception
+    {
+        final DefaultConfiguration checkConfig = createCheckConfig(ImportControlCheck.class);
+        checkConfig.addAttribute("file", System.getProperty("testinputs.dir")
+                + "/import-control_broken.xml");
+        final String[] expected = {};
+        try {
+            verify(checkConfig, getPath("imports" + File.separator
+                    + "InputImportControl.java"), expected);
+            fail("should fail");
+        }
+        catch (CheckstyleException ex) {
+            ;
+        }
+    }
+}