diff --git a/tests/test_frozen_field.py b/tests/test_frozen_field.py
index ca42527c977f16477faeca651202f23cd3f4589c..4bf10325a348f59533ac309d8407a1eecbbeb989 100644
--- a/tests/test_frozen_field.py
+++ b/tests/test_frozen_field.py
@@ -1,4 +1,3 @@
-#! /usr/bin/env python2
 #######################################################################
 #                                                                     #
 #  Copyright 2015 Max Planck Institute                                #
@@ -25,7 +24,7 @@
 
 
 
-from test_base import *
+from base import *
 
 class FrozenFieldParticles(bfps.NavierStokes):
     def __init__(
@@ -33,12 +32,16 @@ class FrozenFieldParticles(bfps.NavierStokes):
             name = 'FrozenFieldParticles',
             work_dir = './',
             simname = 'test',
-            fluid_precision = 'single'):
+            frozen_fields = True,
+            fluid_precision = 'single',
+            use_fftw_wisdom = False):
         super(FrozenFieldParticles, self).__init__(
                 name = name,
                 work_dir = work_dir,
                 simname = simname,
-                fluid_precision = fluid_precision)
+                fluid_precision = fluid_precision,
+                frozen_fields = frozen_fields,
+                use_fftw_wisdom = use_fftw_wisdom)
     def fill_up_fluid_code(self):
         self.fluid_includes += '#include <cstring>\n'
         self.fluid_variables += 'fluid_solver<{0}> *fs;\n'.format(self.C_dtype)
diff --git a/tests/test_particles.py b/tests/test_particles.py
index 93801df1c7263964c8bf1ae2a189a826b4cc2763..92f82b901624ad0b48cf9ba5e3661de7f5071f03 100644
--- a/tests/test_particles.py
+++ b/tests/test_particles.py
@@ -28,7 +28,7 @@
 import numpy as np
 import matplotlib.pyplot as plt
 
-from test_base import *
+from base import *
 
 from test_frozen_field import FrozenFieldParticles
 from test_convergence import convergence_test
@@ -147,7 +147,17 @@ class err_finder:
         return errlist
 
 if __name__ == '__main__':
-    opt = parser.parse_args()
+    opt = parser.parse_args(
+            ['-n', '16',
+             '--run',
+             '--initialize',
+             '--frozen',
+             '--ncpu', '2',
+             '--nparticles', '128',
+             '--niter_todo', '16',
+             '--precision', 'single',
+             '--wd', 'data/single'] +
+            sys.argv[1:])
     if opt.precision == 'single':
         dtype = np.complex64
     elif opt.precision == 'double':
diff --git a/tox_particles.ini b/tox_particles.ini
deleted file mode 100644
index e76f1b387753e12f9e6b6270f2959c1e1bca4ba5..0000000000000000000000000000000000000000
--- a/tox_particles.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-[tox]
-envlist = py27
-[testenv]
-whitelist_externals =
-    echo
-    cp
-passenv = LD_LIBRARY_PATH
-changedir =
-    {envtmpdir}
-commands =
-    cp -r {toxinidir}/tests {envtmpdir}
-    python tests/test_particles.py \
-        -n 16 \
-        --run \
-        --initialize \
-        --ncpu 2 \
-        --nparticles 32 \
-        --niter_todo 16 \
-        --precision single \
-        --wd "data/single"
-    python tests/test_particles.py \
-        -n 16 \
-        --run \
-        --initialize \
-        --ncpu 2 \
-        --nparticles 32 \
-        --niter_todo 16 \
-        --precision double \
-        --wd "data/double"
-