diff --git a/bin.src/rucio-integration-register b/bin.src/rucio-integration-register
index 0b62e37..c576904 100755
--- a/bin.src/rucio-integration-register
+++ b/bin.src/rucio-integration-register
@@ -6,8 +6,8 @@ import sys
from lsst.daf.butler import Butler
from lsst.dm.rucio.register.app_parser import AppParser
-from lsst.dm.rucio.register.rucio_register_config import RucioRegisterConfig
from lsst.dm.rucio.register.rucio_interface import RucioInterface
+from lsst.dm.rucio.register.rucio_register_config import RucioRegisterConfig
logger = logging.getLogger(__name__)
diff --git a/python/lsst/dm/rucio/register/dataset_map.py b/python/lsst/dm/rucio/register/dataset_map.py
index bd3eff2..3645362 100644
--- a/python/lsst/dm/rucio/register/dataset_map.py
+++ b/python/lsst/dm/rucio/register/dataset_map.py
@@ -20,6 +20,7 @@
# along with this program. If not, see .
import sys
+
import yaml
diff --git a/python/lsst/dm/rucio/register/rucio_interface.py b/python/lsst/dm/rucio/register/rucio_interface.py
index 1d41d27..0807589 100644
--- a/python/lsst/dm/rucio/register/rucio_interface.py
+++ b/python/lsst/dm/rucio/register/rucio_interface.py
@@ -28,12 +28,12 @@
import zlib
import lsst.daf.butler
-from lsst.dm.rucio.register.resource_bundle import ResourceBundle
+import rucio.common.exception
from lsst.dm.rucio.register.dataset_map import DatasetMap
+from lsst.dm.rucio.register.resource_bundle import ResourceBundle
from lsst.resources import ResourcePath
from rucio.client.didclient import DIDClient
from rucio.client.replicaclient import ReplicaClient
-import rucio.common.exception
__all__ = ["RucioInterface"]
diff --git a/python/lsst/dm/rucio/register/rucio_register_config.py b/python/lsst/dm/rucio/register/rucio_register_config.py
index 485a73d..3ee891b 100644
--- a/python/lsst/dm/rucio/register/rucio_register_config.py
+++ b/python/lsst/dm/rucio/register/rucio_register_config.py
@@ -20,6 +20,7 @@
# along with this program. If not, see .
import os
+
import yaml
RUCIO_REGISTER_CONFIG = "RUCIO_REGISTER_CONFIG"
diff --git a/tests/test_app_parser.py b/tests/test_app_parser.py
index 4c22baf..52f7bda 100644
--- a/tests/test_app_parser.py
+++ b/tests/test_app_parser.py
@@ -23,8 +23,10 @@
import logging
import os
import unittest
+
import lsst.utils.tests
-from lsst.dm.rucio.register.app_parser import AppParser
+from lsst.dm.rucio.register.app_parser import AppParser
+
class AppParserTestCase(unittest.TestCase):
diff --git a/tests/test_dataset_map.py b/tests/test_dataset_map.py
index 80106d4..bbbd22a 100644
--- a/tests/test_dataset_map.py
+++ b/tests/test_dataset_map.py
@@ -22,8 +22,10 @@
import os
import unittest
+
import lsst.utils.tests
-from lsst.dm.rucio.register.dataset_map import DatasetMap
+from lsst.dm.rucio.register.dataset_map import DatasetMap
+
class DatasetMapTestCase(unittest.TestCase):
diff --git a/tests/test_interface.py b/tests/test_interface.py
index 79fc829..42e2694 100644
--- a/tests/test_interface.py
+++ b/tests/test_interface.py
@@ -30,11 +30,12 @@
import lsst.utils.tests
from lsst.daf.butler import Butler, DatasetRef, FileDataset
from lsst.daf.butler.registry import DatasetTypeError, MissingCollectionError
-from lsst.dm.rucio.register.rucio_register_config import RucioRegisterConfig
from lsst.dm.rucio.register.rucio_interface import RucioInterface
+from lsst.dm.rucio.register.rucio_register_config import RucioRegisterConfig
from lsst.pipe.base import Instrument
from lsst.resources import ResourcePath
+
class InterfaceTestCase(lsst.utils.tests.TestCase):
def setUp(self):
diff --git a/tests/test_resource_bundle.py b/tests/test_resource_bundle.py
index ed8674d..3bb27bc 100644
--- a/tests/test_resource_bundle.py
+++ b/tests/test_resource_bundle.py
@@ -22,8 +22,10 @@
import os
import unittest
+
import lsst.utils.tests
-from lsst.dm.rucio.register.resource_bundle import ResourceBundle
+from lsst.dm.rucio.register.resource_bundle import ResourceBundle
+
class ResourceBundleTestCase(unittest.TestCase):
diff --git a/tests/test_rucio_config.py b/tests/test_rucio_config.py
index aba9fa8..b9b9654 100644
--- a/tests/test_rucio_config.py
+++ b/tests/test_rucio_config.py
@@ -22,8 +22,10 @@
import os
import unittest
+
import lsst.utils.tests
-from lsst.dm.rucio.register.rucio_register_config import RucioRegisterConfig
+from lsst.dm.rucio.register.rucio_register_config import RucioRegisterConfig
+
class RucioRegisterConfigTestCase(unittest.TestCase):