diff --git a/ckan/new_tests/lib/test_munge.py b/ckan/new_tests/lib/test_munge.py
index 9576886c733..18c473982f2 100644
--- a/ckan/new_tests/lib/test_munge.py
+++ b/ckan/new_tests/lib/test_munge.py
@@ -1,6 +1,7 @@
 from nose import tools as nose_tools
 
-from ckan.lib.munge import munge_filename
+from ckan.lib.munge import (munge_filename, munge_name,
+                            munge_title_to_name, munge_tag)
 
 
 class TestMungeFilename(object):
@@ -18,3 +19,46 @@ def test_munge_filename_with_hyphens_multiple_pass(self):
         # Munge twice
         second_munged_filename = munge_filename(first_munged_filename)
         nose_tools.assert_equal(expected_filename, second_munged_filename)
+
+
+class TestMungeName(object):
+
+    def test_munge_name(self):
+        def test_munge(title, expected_munge):
+            munge = munge_name(title)
+            nose_tools.assert_equal(munge, expected_munge)
+
+        test_munge('unchanged', 'unchanged')
+        test_munge('bad spaces', 'bad-spaces')
+        test_munge('s', 's_')  # too short
+        test_munge('random:other%character&', 'random-othercharacter')
+        test_munge(u'u with umlaut \xfc', 'u-with-umlaut-u')
+
+
+class TestMungeTitleToName(object):
+
+    def test_munge_title_to_name(self):
+        def test_munge(title, expected_munge):
+            munge = munge_title_to_name(title)
+            nose_tools.assert_equal(munge, expected_munge)
+
+        test_munge('unchanged', 'unchanged')
+        test_munge('some spaces  here', 'some-spaces-here')
+        test_munge('s', 's_')  # too short
+        test_munge('random:other%character&', 'random-othercharacter')
+        test_munge(u'u with umlaut \xfc', 'u-with-umlaut-u')
+        test_munge('reallylong' * 12, 'reallylong' * 9 + 'reall')
+        test_munge('reallylong' * 12 + ' - 2012', 'reallylong' * 9 + '-2012')
+
+
+class TestMungeTag:
+
+    def test_munge_tag(self):
+        def test_munge(title, expected_munge):
+            munge = munge_tag(title)
+            nose_tools.assert_equal(munge, expected_munge)
+
+        test_munge('unchanged', 'unchanged')
+        test_munge('s', 's_')  # too short
+        test_munge('some spaces  here', 'some-spaces--here')
+        test_munge('random:other%character&', 'randomothercharacter')
diff --git a/ckan/tests/lib/test_munge.py b/ckan/tests/lib/test_munge.py
deleted file mode 100644
index 9e4e6cffa63..00000000000
--- a/ckan/tests/lib/test_munge.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from nose.tools import assert_equal
-
-import ckan.lib.munge
-
-class TestMunge:
-    def test_munge_name(self):
-        def test_munge(title, expected_munge):
-            munge = ckan.lib.munge.munge_name(title)
-            assert_equal(munge, expected_munge)
-
-        test_munge('unchanged', 'unchanged')
-        test_munge('bad spaces', 'bad-spaces')
-        test_munge('s', 's_') # too short
-        test_munge('random:other%character&', 'random-othercharacter')
-        test_munge(u'u with umlaut \xfc', 'u-with-umlaut-u') 
-
-    def test_munge_title_to_name(self):
-        def test_munge(title, expected_munge):
-            munge = ckan.lib.munge.munge_title_to_name(title)
-            assert_equal(munge, expected_munge)
-
-        test_munge('unchanged', 'unchanged')
-        test_munge('some spaces  here', 'some-spaces-here')
-        test_munge('s', 's_') # too short
-        test_munge('random:other%character&', 'random-othercharacter')
-        test_munge(u'u with umlaut \xfc', 'u-with-umlaut-u') 
-        test_munge('reallylong'*12 , 'reallylong'*9 + 'reall') 
-        test_munge('reallylong'*12 + ' - 2012' , 'reallylong'*9 + '-2012') 
-
-    def test_munge_tag(self):
-        def test_munge(title, expected_munge):
-            munge = ckan.lib.munge.munge_tag(title)
-            assert_equal(munge, expected_munge)
-
-        test_munge('unchanged', 'unchanged')
-        test_munge('s', 's_') # too short
-        test_munge('some spaces  here', 'some-spaces--here')
-        test_munge('random:other%character&', 'randomothercharacter')