diff --git a/IPython/CrashHandler.py b/IPython/core/crashhandler.py
similarity index 100%
rename from IPython/CrashHandler.py
rename to IPython/core/crashhandler.py
diff --git a/IPython/core/tests/test_imports.py b/IPython/core/tests/test_imports.py
index 8a2770e..e9752d1 100644
--- a/IPython/core/tests/test_imports.py
+++ b/IPython/core/tests/test_imports.py
@@ -4,3 +4,5 @@
 def test_import_completer():
     from IPython.core import completer
 
+def test_import_crashhandler():
+    from IPython.core import crashhandler
diff --git a/IPython/iplib.py b/IPython/iplib.py
index 26e9ba0..e49816a 100644
--- a/IPython/iplib.py
+++ b/IPython/iplib.py
@@ -724,8 +724,8 @@ class InteractiveShell(object,Magic):
         if self.isthreaded:
             ipCrashHandler = ultraTB.FormattedTB()
         else:
-            from IPython import CrashHandler
-            ipCrashHandler = CrashHandler.IPythonCrashHandler(self)
+            from IPython.core import crashhandler
+            ipCrashHandler = crashhandler.IPythonCrashHandler(self)
         self.set_crash_handler(ipCrashHandler)
 
         # and add any custom exception handlers the user may have specified
diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py
index 4f2c81d..7c44267 100644
--- a/IPython/testing/iptest.py
+++ b/IPython/testing/iptest.py
@@ -199,7 +199,7 @@ def make_runners():
     # decorator.  See ticket https://bugs.launchpad.net/bugs/366209
     top_mod = \
       ['backgroundjobs.py', 'coloransi.py', 'completer.py', 'configloader.py',
-       'CrashHandler.py', 'Debugger.py', 'deep_reload.py', 'demo.py',
+       'crashhandler.py', 'Debugger.py', 'deep_reload.py', 'demo.py',
        'DPyGetOpt.py', 'dtutils.py', 'excolors.py', 'FakeModule.py',
        'generics.py', 'genutils.py', 'history.py', 'hooks.py', 'ipapi.py',
        'iplib.py', 'ipmaker.py', 'ipstruct.py', 'Itpl.py',