6 files changed, 9 insertions, 24 deletions
diff --git a/src/leap/soledad/tests/test_couch.py b/src/leap/soledad/tests/test_couch.py
index d6b9ad83..b3cbc1bc 100644
--- a/src/leap/soledad/tests/test_couch.py
+++ b/src/leap/soledad/tests/test_couch.py
@@ -31,10 +31,7 @@ from leap.soledad.backends import couch
 from leap.soledad.tests import u1db_tests as tests
 from leap.soledad.tests.u1db_tests import test_backends
 from leap.soledad.tests.u1db_tests import test_sync
-try:
-    import simplejson as json
-except ImportError:
-    import json  # noqa
+import simplejson as json
 from leap.soledad.backends.leap_backend import (
     LeapDocument,
 )
diff --git a/src/leap/soledad/tests/test_crypto.py b/src/leap/soledad/tests/test_crypto.py
index 72eac6eb..5432856e 100644
--- a/src/leap/soledad/tests/test_crypto.py
+++ b/src/leap/soledad/tests/test_crypto.py
@@ -23,10 +23,7 @@ Tests for cryptographic related stuff.
 import os
 import shutil
 import tempfile
-try:
-    import simplejson as json
-except ImportError:
-    import json  # noqa
+import simplejson as json
 import hashlib
 
 
diff --git a/src/leap/soledad/tests/test_leap_backend.py b/src/leap/soledad/tests/test_leap_backend.py
index 458fc5d5..d04ee412 100644
--- a/src/leap/soledad/tests/test_leap_backend.py
+++ b/src/leap/soledad/tests/test_leap_backend.py
@@ -23,12 +23,10 @@ Test Leap backend bits.
 import u1db
 import os
 import ssl
-try:
-    import simplejson as json
-except ImportError:
-    import json  # noqa
+import simplejson as json
 import cStringIO
 
+
 from u1db.sync import Synchronizer
 from u1db.remote import (
     http_client,
diff --git a/src/leap/soledad/tests/test_server.py b/src/leap/soledad/tests/test_server.py
index d574b50e..ec3f636b 100644
--- a/src/leap/soledad/tests/test_server.py
+++ b/src/leap/soledad/tests/test_server.py
@@ -23,10 +23,7 @@ Tests for server-related functionality.
 import os
 import shutil
 import tempfile
-try:
-    import simplejson as json
-except ImportError:
-    import json  # noqa
+import simplejson as json
 import hashlib
 
 
diff --git a/src/leap/soledad/tests/test_soledad.py b/src/leap/soledad/tests/test_soledad.py
index 5eef039f..1c0e6d4a 100644
--- a/src/leap/soledad/tests/test_soledad.py
+++ b/src/leap/soledad/tests/test_soledad.py
@@ -24,10 +24,7 @@ Tests for general Soledad functionality.
 import os
 import re
 import tempfile
-try:
-    import simplejson as json
-except ImportError:
-    import json  # noqa
+import simplejson as json
 
 
 from leap.common.testing.basetest import BaseLeapTest
diff --git a/src/leap/soledad/tests/test_sqlcipher.py b/src/leap/soledad/tests/test_sqlcipher.py
index 5bfb8de6..b0ec97a0 100644
--- a/src/leap/soledad/tests/test_sqlcipher.py
+++ b/src/leap/soledad/tests/test_sqlcipher.py
@@ -24,11 +24,10 @@ Test sqlcipher backend internals.
 import os
 import time
 import unittest
-try:
-    import simplejson as json
-except ImportError:
-    import json  # noqa
+import simplejson as json
 import threading
+
+
 from pysqlcipher import dbapi2
 from StringIO import StringIO