diff --git a/tests/test_builder/test_mock.py b/tests/test_builder/test_mock.py
index 3216c228..4c546915 100644
--- a/tests/test_builder/test_mock.py
+++ b/tests/test_builder/test_mock.py
@@ -9,7 +9,7 @@ import kobo.rpmlib
 from module_build_service import conf
 from module_build_service.models import ModuleBuild, ComponentBuild, make_session
 from module_build_service.builder.MockModuleBuilder import MockModuleBuilder
-from tests import init_data, clean_database
+from tests import clean_database
 
 
 class TestMockModuleBuilder:
diff --git a/tests/test_scheduler/test_poller.py b/tests/test_scheduler/test_poller.py
index 1ecd1dce..1218c539 100644
--- a/tests/test_scheduler/test_poller.py
+++ b/tests/test_scheduler/test_poller.py
@@ -21,7 +21,7 @@
 import pytest
 from mock import patch
 from module_build_service import models, conf
-from tests import reuse_component_init_data, init_data, db, clean_database
+from tests import reuse_component_init_data, db, clean_database
 import mock
 import koji
 from module_build_service.scheduler.producer import MBSProducer
diff --git a/tests/test_utils/test_utils.py b/tests/test_utils/test_utils.py
index 0090527e..c05cf1c6 100644
--- a/tests/test_utils/test_utils.py
+++ b/tests/test_utils/test_utils.py
@@ -29,9 +29,8 @@ import module_build_service.utils
 import module_build_service.scm
 from module_build_service import models, conf
 from module_build_service.errors import ProgrammingError, ValidationError, UnprocessableEntity
-from tests import (reuse_component_init_data, init_data, db,
-                   reuse_shared_userspace_init_data,
-                   clean_database)
+from tests import (
+    reuse_component_init_data, db, reuse_shared_userspace_init_data, clean_database)
 import mock
 import koji
 import pytest
@@ -75,6 +74,7 @@ class FakeSCM(object):
     def get_module_yaml(self):
         return path.join(self.sourcedir, self.name + ".yaml")
 
+
 class TestUtilsComponentReuse:
 
     def setup_method(self, test_method):
diff --git a/tests/test_views/test_views.py b/tests/test_views/test_views.py
index 4e3bffbe..e68d2b62 100644
--- a/tests/test_views/test_views.py
+++ b/tests/test_views/test_views.py
@@ -254,7 +254,8 @@ class TestViews:
                 "state": 1,
                 "stream": "4.3.43",
                 "time_submitted": "2016-09-03T12:38:33Z",
-                "scmurl": "git://pkgs.domain.local/modules/testmodule?#ca95886c7a443b36a9ce31abda1f9bef22f2f8c9",
+                "scmurl": ("git://pkgs.domain.local/modules/testmodule"
+                           "?#ca95886c7a443b36a9ce31abda1f9bef22f2f8c9"),
                 "id": 6,
                 "context": "00000000",
                 "time_completed": None,
@@ -287,7 +288,8 @@ class TestViews:
                 "state": 3,
                 "stream": "1",
                 "time_submitted": "2016-09-03T12:35:33Z",
-                "scmurl": "git://pkgs.domain.local/modules/postgressql?#aa95886c7a443b36a9ce31abda1f9bef22f2f8c9",
+                "scmurl": ("git://pkgs.domain.local/modules/postgressql"
+                           "?#aa95886c7a443b36a9ce31abda1f9bef22f2f8c9"),
                 "id": 5,
                 "context": "00000000",
                 "time_completed": "2016-09-03T11:37:19Z",