diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py
index 7a345217..c8aa56b3 100755
--- a/drivers/LinstorSR.py
+++ b/drivers/LinstorSR.py
@@ -779,9 +779,8 @@ def scan(self, uuid):
 
         # Update the database before the restart of the GC to avoid
         # bad sync in the process if new VDIs have been introduced.
-        ret = super(LinstorSR, self).scan(self.uuid)
+        super(LinstorSR, self).scan(self.uuid)
         self._kick_gc()
-        return ret
 
     @_locked_load
     def vdi(self, uuid):
diff --git a/tests/pylintrc b/tests/pylintrc
index a982913b..4588675b 100644
--- a/tests/pylintrc
+++ b/tests/pylintrc
@@ -84,7 +84,7 @@ ignored-classes=SQLObject
 
 # List of members which are set dynamically and missed by pylint inference
 # system, and so shouldn't trigger E0201 when accessed.
-generated-members=REQUEST,acl_users,aq_parent
+generated-members=REQUEST,acl_users,aq_parent,linstor.*
 
 # List of module names for which member attributes should not be checked
 # # (useful for modules/projects where namespaces are manipulated during runtime
diff --git a/tests/test_MooseFSSR.py b/tests/test_MooseFSSR.py
index feaac626..f4e0a852 100644
--- a/tests/test_MooseFSSR.py
+++ b/tests/test_MooseFSSR.py
@@ -1,4 +1,6 @@
-import mock
+from unittest import mock
+import unittest
+
 import MooseFSSR
 import unittest
 
diff --git a/tests/test_ZFSSR.py b/tests/test_ZFSSR.py
index e95ab7eb..ac2c6eb7 100644
--- a/tests/test_ZFSSR.py
+++ b/tests/test_ZFSSR.py
@@ -1,8 +1,9 @@
+from unittest import mock
+import unittest
+
 import FileSR
-import mock
 import os
 import SR
-import unittest
 import ZFSSR