diff --git a/examples/visualization/stress_test.py b/examples/visualization/stress.py
similarity index 100%
rename from examples/visualization/stress_test.py
rename to examples/visualization/stress.py
diff --git a/setup.py b/setup.py
index e46857f..6330944 100755
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ setup(
     keywords = "quantum",
     setup_requires = ["numpy"],
     scripts = ["bin/abpserver"],
-    install_requires = ["numpy", "networkx", "tqdm", "websocket-client", "websocket-server"],
+    install_requires = ["numpy", "networkx", "websocket-client", "websocket-server"],
     package_data = {"abp.static": STATIC},
     include_package_data=True
 )
diff --git a/tests/mock.py b/tests/mock.py
index e49141f..6cf84ff 100644
--- a/tests/mock.py
+++ b/tests/mock.py
@@ -6,10 +6,8 @@ import numpy as np
 import abp
 from abp import GraphState, clifford, qi
 from numpy import random
-try:
-    from anders_briegel import graphsim
-except ImportError:
-    raise nose.SkipTest("Original C++ is not available, skipping test")
+import pytest
+from anders_briegel import graphsim
 
 # We always run with A&B's CZ table when we are testing
 clifford.use_old_cz()
diff --git a/tests/test_against_anders_and_briegel.py b/tests/test_against_anders_and_briegel.py
index acc2132..7ec8ba3 100644
--- a/tests/test_against_anders_and_briegel.py
+++ b/tests/test_against_anders_and_briegel.py
@@ -1,9 +1,9 @@
 from abp import GraphState, CircuitModel, clifford
 import numpy as np
 from numpy import random
-from tqdm import tqdm
 import itertools as it
-import mock
+import pytest
+mock = pytest.importorskip("mock")
 
 REPEATS = 100
 DEPTH = 100
@@ -38,7 +38,7 @@ def test_cz_table():
 
 def test_cz_hadamard(n=10):
     """ Test CZs and Hadamards at random """
-    for i in tqdm(list(range(REPEATS)), desc="Testing CZ and Hadamard against A&B"):
+    for i in list(range(REPEATS)):
         circuit = random.choice(["cz", "hadamard"], DEPTH)
         circuit = [(mock.random_pair(n), gate) if gate == "cz"
                    else (random.choice(list(range(n))), gate)
@@ -48,7 +48,7 @@ def test_cz_hadamard(n=10):
 
 def test_all(n=10):
     """ Test everything """
-    for i in tqdm(list(range(REPEATS)), desc="Testing CZ and Hadamard against A&B"):
+    for i in list(range(REPEATS)):
         circuit = random.choice(["cz"] * 10 + list(range(24)), DEPTH)
         circuit = [(mock.random_pair(n), gate) if gate == "cz"
                    else (random.choice(list(range(n))), gate)
diff --git a/tests/test_graphstate.py b/tests/test_graphstate.py
index 78f8f15..d64d632 100644
--- a/tests/test_graphstate.py
+++ b/tests/test_graphstate.py
@@ -1,9 +1,9 @@
 from abp import GraphState, CircuitModel, clifford
-import mock
 import random
 import numpy as np
-from tqdm import tqdm
 import networkx as nx
+import pytest
+mock = pytest.importorskip("mock")
 
 REPEATS = 100
 DEPTH = 100
@@ -105,7 +105,7 @@ def test_local_complementation():
 
 def test_single_qubit():
     """ A multi qubit test with Hadamards only"""
-    for repeat in tqdm(list(range(REPEATS)), desc="Single qubit rotations against CircuitModel"):
+    for repeat in list(range(REPEATS)):
         circuit = [(0, random.choice(list(range(24)))) for i in range(DEPTH)]
         a = mock.circuit_to_state(mock.ABPWrapper, 1, circuit)
         b = mock.circuit_to_state(mock.CircuitModelWrapper, 1, circuit)
@@ -114,7 +114,7 @@ def test_single_qubit():
 
 def test_graph_state_multiqubit(n=6):
     """ A multi qubit test with Hadamards only"""
-    for repeat in tqdm(list(range(REPEATS)), desc="Random graph states against the CircuitModel"):
+    for repeat in list(range(REPEATS)):
         circuit = mock.random_graph_circuit(n)
         a = mock.circuit_to_state(mock.ABPWrapper, n, circuit)
         b = mock.circuit_to_state(mock.CircuitModelWrapper, n, circuit)
@@ -123,7 +123,7 @@ def test_graph_state_multiqubit(n=6):
 
 def test_stabilizer_state_multiqubit(n=6):
     """ A multi qubit test with arbitrary local rotations """
-    for repeat in tqdm(list(range(REPEATS)), desc="Random Clifford circuits against the CircuitModel"):
+    for repeat in list(range(REPEATS)):
         circuit = mock.random_stabilizer_circuit(n)
         a = mock.circuit_to_state(mock.ABPWrapper, n, circuit)
         b = mock.circuit_to_state(mock.CircuitModelWrapper, n, circuit)
diff --git a/tests/test_json.py b/tests/test_json.py
index 9c0053b..fd75911 100644
--- a/tests/test_json.py
+++ b/tests/test_json.py
@@ -1,5 +1,6 @@
-import mock
 import abp
+import pytest
+mock = pytest.importorskip("mock")
 
 def test_json():
     """ Test to_json and from_json """
diff --git a/tests/test_measurement.py b/tests/test_measurement.py
index b4ab1d3..82fefe1 100644
--- a/tests/test_measurement.py
+++ b/tests/test_measurement.py
@@ -1,7 +1,7 @@
 import numpy as np
 from abp import GraphState
 from abp import qi, clifford
-from tqdm import tqdm
+
 import random
 import itertools as it
 
diff --git a/tests/test_mercedes.py b/tests/test_mercedes.py
index d834e82..d4b6d6c 100644
--- a/tests/test_mercedes.py
+++ b/tests/test_mercedes.py
@@ -1,6 +1,7 @@
 from abp import GraphState
 from abp.util import xyz
-from mock import simple_graph
+import pytest
+mock = pytest.importorskip("mock")
 
 def linear_cluster(n):
     g = GraphState(list(range(n)), vop="hadamard")
@@ -51,7 +52,7 @@ def test_is_determinate():
 
 def test_copy():
     """ Make a copy of a graph """
-    a = simple_graph()
+    a = mock.simple_graph()
     b = a.copy()
     assert a == b
     
diff --git a/tests/test_nx.py b/tests/test_nx.py
index e43ccc6..9f35131 100644
--- a/tests/test_nx.py
+++ b/tests/test_nx.py
@@ -3,12 +3,13 @@ import networkx as nx
 from abp import GraphState, NXGraphState
 from abp import clifford
 from abp.util import xyz
-from mock import simple_graph
+import pytest
+mock = pytest.importorskip("mock")
 
 
 def test_json_basic():
     """ Test that we can export to JSON """
-    g = simple_graph()
+    g = mock.simple_graph()
     js = g.to_json()
     assert "adj" in js
     assert "node" in js
diff --git a/tests/test_qi.py b/tests/test_qi.py
index 7f5732d..eccf5e6 100644
--- a/tests/test_qi.py
+++ b/tests/test_qi.py
@@ -1,7 +1,7 @@
 import numpy as np
 from abp import qi, GraphState
-from tqdm import tqdm
-import mock
+import pytest
+mock = pytest.importorskip("mock")
 
 DEPTH = 1000
 
diff --git a/tests/test_stabilizer.py b/tests/test_stabilizer.py
index 61811a4..a71de4b 100644
--- a/tests/test_stabilizer.py
+++ b/tests/test_stabilizer.py
@@ -1,6 +1,6 @@
 from abp import GraphState
-from tqdm import tqdm
-import mock
+import pytest
+mock = pytest.importorskip("mock")
 
 REPEATS = 1000