diff --git a/delimiter/test.py b/delimiter/test.py
new file mode 100644
index 0000000..910c55d
--- /dev/null
+++ b/delimiter/test.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+# 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 oslotest import base
+
+
+class TestCase(base.BaseTestCase):
+    """Base test case + additions for all delimiter tests."""
diff --git a/delimiter/tests/test_delimiter.py b/delimiter/tests/test_delimiter.py
index 39f5cfe..81b48d4 100644
--- a/delimiter/tests/test_delimiter.py
+++ b/delimiter/tests/test_delimiter.py
@@ -12,17 +12,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-"""
-test_delimiter
-----------------------------------
-
-Tests for `delimiter` module.
-"""
-
-from oslotest import base
+from delimiter import test
 
 
-class TestDelimiter(base.BaseTestCase):
+class TestDelimiter(test.TestCase):
 
     def test_something(self):
         pass