diff --git a/osc_lib/tests/utils.py b/osc_lib/tests/utils/__init__.py
similarity index 100%
rename from osc_lib/tests/utils.py
rename to osc_lib/tests/utils/__init__.py
diff --git a/osc_lib/tests/utils/test_columns.py b/osc_lib/tests/utils/test_columns.py
new file mode 100644
index 0000000..6bbf925
--- /dev/null
+++ b/osc_lib/tests/utils/test_columns.py
@@ -0,0 +1,58 @@
+#   Licensed under the Apache License, Version 2.0 (the "License"); you may
+#   not use this file except in compliance with the License. You may obtain
+#   a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#   License for the specific language governing permissions and limitations
+#   under the License.
+#
+
+from osc_lib.tests import utils as test_utils
+from osc_lib.utils import columns as column_utils
+
+
+class TestColumnUtils(test_utils.TestCase):
+
+    def test_get_column_definitions(self):
+        attr_map = (
+            ('id', 'ID', column_utils.LIST_BOTH),
+            ('tenant_id', 'Project', column_utils.LIST_LONG_ONLY),
+            ('name', 'Name', column_utils.LIST_BOTH),
+            ('summary', 'Summary', column_utils.LIST_SHORT_ONLY),
+        )
+        headers, columns = column_utils.get_column_definitions(
+            attr_map, long_listing=False)
+        self.assertEqual(['id', 'name', 'summary'], columns)
+        self.assertEqual(['ID', 'Name', 'Summary'], headers)
+
+    def test_get_column_definitions_long(self):
+        attr_map = (
+            ('id', 'ID', column_utils.LIST_BOTH),
+            ('tenant_id', 'Project', column_utils.LIST_LONG_ONLY),
+            ('name', 'Name', column_utils.LIST_BOTH),
+            ('summary', 'Summary', column_utils.LIST_SHORT_ONLY),
+        )
+        headers, columns = column_utils.get_column_definitions(
+            attr_map, long_listing=True)
+        self.assertEqual(['id', 'tenant_id', 'name'], columns)
+        self.assertEqual(['ID', 'Project', 'Name'], headers)
+
+    def test_get_columns(self):
+        item = {
+            'id': 'test-id',
+            'tenant_id': 'test-tenant_id',
+            # 'name' is not included
+            'foo': 'bar',  # unknown attribute
+        }
+        attr_map = (
+            ('id', 'ID', column_utils.LIST_BOTH),
+            ('tenant_id', 'Project', column_utils.LIST_LONG_ONLY),
+            ('name', 'Name', column_utils.LIST_BOTH),
+        )
+        columns, display_names = column_utils.get_columns(item, attr_map)
+        self.assertEqual(tuple(['id', 'tenant_id', 'foo']), columns)
+        self.assertEqual(tuple(['ID', 'Project', 'foo']), display_names)
diff --git a/osc_lib/tests/test_utils.py b/osc_lib/tests/utils/test_utils.py
similarity index 94%
rename from osc_lib/tests/test_utils.py
rename to osc_lib/tests/utils/test_utils.py
index d0c554d..a32f888 100644
--- a/osc_lib/tests/test_utils.py
+++ b/osc_lib/tests/utils/test_utils.py
@@ -25,7 +25,6 @@ from osc_lib import exceptions
 from osc_lib.tests import fakes
 from osc_lib.tests import utils as test_utils
 from osc_lib import utils
-from osc_lib.utils import columns as column_utils
 
 PASSWORD = "Pa$$w0rd"
 WASSPORD = "Wa$$p0rd"
@@ -746,49 +745,6 @@ class TestFindResource(test_utils.TestCase):
         self.assertEqual(expected, actual_unsorted)
 
 
-class TestColumnUtils(test_utils.TestCase):
-
-    def test_get_column_definitions(self):
-        attr_map = (
-            ('id', 'ID', column_utils.LIST_BOTH),
-            ('tenant_id', 'Project', column_utils.LIST_LONG_ONLY),
-            ('name', 'Name', column_utils.LIST_BOTH),
-            ('summary', 'Summary', column_utils.LIST_SHORT_ONLY),
-        )
-        headers, columns = column_utils.get_column_definitions(
-            attr_map, long_listing=False)
-        self.assertEqual(['id', 'name', 'summary'], columns)
-        self.assertEqual(['ID', 'Name', 'Summary'], headers)
-
-    def test_get_column_definitions_long(self):
-        attr_map = (
-            ('id', 'ID', column_utils.LIST_BOTH),
-            ('tenant_id', 'Project', column_utils.LIST_LONG_ONLY),
-            ('name', 'Name', column_utils.LIST_BOTH),
-            ('summary', 'Summary', column_utils.LIST_SHORT_ONLY),
-        )
-        headers, columns = column_utils.get_column_definitions(
-            attr_map, long_listing=True)
-        self.assertEqual(['id', 'tenant_id', 'name'], columns)
-        self.assertEqual(['ID', 'Project', 'Name'], headers)
-
-    def test_get_columns(self):
-        item = {
-            'id': 'test-id',
-            'tenant_id': 'test-tenant_id',
-            # 'name' is not included
-            'foo': 'bar',  # unknown attribute
-        }
-        attr_map = (
-            ('id', 'ID', column_utils.LIST_BOTH),
-            ('tenant_id', 'Project', column_utils.LIST_LONG_ONLY),
-            ('name', 'Name', column_utils.LIST_BOTH),
-        )
-        columns, display_names = column_utils.get_columns(item, attr_map)
-        self.assertEqual(tuple(['id', 'tenant_id', 'foo']), columns)
-        self.assertEqual(tuple(['ID', 'Project', 'foo']), display_names)
-
-
 class TestAssertItemEqual(test_utils.TestCommand):
 
     def test_assert_normal_item(self):