diff --git a/mutalyzer/Scheduler.py b/mutalyzer/Scheduler.py
index 005864db3cb5e4586a46688f41a6faae7cd69aa6..cc10261d93cce18730550b3ae823ff1e177ffadf 100644
--- a/mutalyzer/Scheduler.py
+++ b/mutalyzer/Scheduler.py
@@ -103,6 +103,14 @@ class Scheduler() :
         if mutalyzer.is_test():
             return
 
+        # Note: The above check with mutalyzer.is_test is bogus, since during
+        # a normal unit test, the batch checker process is not started in the
+        # environment of the unit tests.
+        # As sort of a hack, we therefore check for the patented address
+        # 'test@test.test', used in the unit tests.
+        if mailTo == 'test@test.test':
+            return
+
         #TODO: Handle Connection errors in a try, except clause
         #Expected errors: socket.error
 
diff --git a/tests/test_website.py b/tests/test_website.py
index ead0e93f90daae13ee6ca4f3c6abccbaedd6784b..44abe1dd7b6db57c91fc6046b49b56955b7232b2 100644
--- a/tests/test_website.py
+++ b/tests/test_website.py
@@ -284,7 +284,7 @@ class TestWSGI():
         if arg1:
             form['arg1'] = arg1
         form['batchType'] = batch_type
-        form['batchEmail'] = 'm.vermaat.hg@lumc.nl'
+        form['batchEmail'] = 'test@test.test'
         form.set('batchFile', ('test_%s.txt' % batch_type,
                                file))
         r = form.submit()