diff --git a/ceilometer/tests/functional/test_bin.py b/ceilometer/tests/unit/test_bin.py
similarity index 97%
rename from ceilometer/tests/functional/test_bin.py
rename to ceilometer/tests/unit/test_bin.py
index 1cd4b165ea..712c7c30b6 100644
--- a/ceilometer/tests/functional/test_bin.py
+++ b/ceilometer/tests/unit/test_bin.py
@@ -167,6 +167,5 @@ class BinCeilometerPollingServiceTestCase(base.BaseTestCase):
             ["ceilometer-polling", "--config-file=%s" % self.tempfile],
             stderr=subprocess.PIPE)
         __, err = self.subp.communicate()
-        expected = ("Exception: Valid values are ['compute', 'central', "
-                    "'ipmi'], but found [\"['central']\"]")
-        self.assertIn(expected, err)
+        self.assertIn(b"Exception: Valid values are ['compute', 'central', "
+                      b"'ipmi'], but found [\"['central']\"]", err)
diff --git a/ceilometer/tests/functional/test_notification.py b/ceilometer/tests/unit/test_notification.py
similarity index 100%
rename from ceilometer/tests/functional/test_notification.py
rename to ceilometer/tests/unit/test_notification.py