diff --git a/src/bmconfigparser.py b/src/bmconfigparser.py
index eb7010c3..8c7abae6 100644
--- a/src/bmconfigparser.py
+++ b/src/bmconfigparser.py
@@ -12,12 +12,9 @@ from six.moves import configparser
 
 try:
     import state
-except ImportError:
-    from . import state
-
-try:
     from singleton import Singleton
 except ImportError:
+    from . import state
     from .singleton import Singleton
 
 SafeConfigParser = configparser.SafeConfigParser
diff --git a/src/tests/test_blindsig.py b/src/tests/test_blindsig.py
index 955c6d9c..76902347 100644
--- a/src/tests/test_blindsig.py
+++ b/src/tests/test_blindsig.py
@@ -4,9 +4,9 @@ Test for ECC blind signatures
 import os
 import unittest
 from hashlib import sha256
-# from .common import skip_python3
+from .common import skip_python3
 
-# skip_python3()
+skip_python3()
 
 from pybitmessage.pyelliptic import ECCBlind, ECCBlindChain, OpenSSL
 
diff --git a/src/tests/test_config_process.py b/src/tests/test_config_process.py
index f3cf19f2..0a612759 100644
--- a/src/tests/test_config_process.py
+++ b/src/tests/test_config_process.py
@@ -6,6 +6,9 @@ import os
 import tempfile
 from pybitmessage.bmconfigparser import BMConfigParser
 from .test_process import TestProcessProto
+from .common import skip_python3
+
+skip_python3()
 
 
 class TestProcessConfig(TestProcessProto):
diff --git a/src/tests/test_process.py b/src/tests/test_process.py
index 7787e1f2..6d4a3cfd 100644
--- a/src/tests/test_process.py
+++ b/src/tests/test_process.py
@@ -10,9 +10,9 @@ import tempfile
 import time
 import unittest
 import psutil
-from .common import cleanup, put_signal_file
 from .common import cleanup, put_signal_file, skip_python3
 
+
 skip_python3()