diff --git a/IPython/irunner.py b/IPython/lib/irunner.py
similarity index 100%
rename from IPython/irunner.py
rename to IPython/lib/irunner.py
diff --git a/IPython/lib/tests/test_imports.py b/IPython/lib/tests/test_imports.py
index 4ad48fa..e0e9e9e 100644
--- a/IPython/lib/tests/test_imports.py
+++ b/IPython/lib/tests/test_imports.py
@@ -8,4 +8,7 @@ def test_import_deepreload():
     from IPython.lib import deepreload
 
 def test_import_demo():
-    from IPython.lib import demo
\ No newline at end of file
+    from IPython.lib import demo
+
+def test_import_irunner():
+    from IPython.lib import demo
diff --git a/IPython/testing/attic/ipdoctest.py b/IPython/testing/attic/ipdoctest.py
index 2660bec..0f457a8 100755
--- a/IPython/testing/attic/ipdoctest.py
+++ b/IPython/testing/attic/ipdoctest.py
@@ -92,7 +92,7 @@ __builtin__._ip = ipapi.get()
 
 
 # runner
-from IPython.irunner import IPythonRunner
+from IPython.lib.irunner import IPythonRunner
 iprunner = IPythonRunner(echo=False)
 
 ###########################################################################
diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py
index 2209add..c9b032b 100644
--- a/IPython/testing/iptest.py
+++ b/IPython/testing/iptest.py
@@ -99,7 +99,7 @@ if not os.name == 'posix':
     EXCLUDE.append(pjoin('IPython', 'platutils_posix'))
 
 if not have_pexpect:
-    EXCLUDE.append(pjoin('IPython', 'irunner'))
+    EXCLUDE.append(pjoin('IPython', 'lib', 'irunner'))
 
 # This is needed for the reg-exp to match on win32 in the ipdoctest plugin.
 if sys.platform == 'win32':
diff --git a/IPython/testing/mkdoctests.py b/IPython/testing/mkdoctests.py
index ea5dd09..4ea9335 100644
--- a/IPython/testing/mkdoctests.py
+++ b/IPython/testing/mkdoctests.py
@@ -37,7 +37,7 @@ import sys
 import tempfile
 
 # IPython-specific libraries
-from IPython import irunner
+from IPython.lib import irunner
 from IPython.utils.genutils import fatal
 
 class IndentOut(object):