diff --git a/tests/test_dosage.py b/tests/test_dosage.py
index b766ab4ed..9e7a11081 100644
--- a/tests/test_dosage.py
+++ b/tests/test_dosage.py
@@ -38,7 +38,7 @@ class TestDosage (unittest.TestCase):
         for option in ("-h", "--help"):
             run_with_options([option])
         # module help
-        run_with_options(["-m", "calvinandhobbes"])
+        run_with_options(["-m", "xkcd"])
         # no comics specified
         self.assertRaises(OSError, run_with_options, [])
         # unknown option
@@ -49,7 +49,7 @@ class TestDosage (unittest.TestCase):
         tmpdir = tempfile.mkdtemp()
         try:
             # fetch html and rss
-            run_with_options(["-n", "2", "-v", "-b", tmpdir, "-o", "html", "-o", "rss", "calvinandhobbes"])
+            run_with_options(["-n", "2", "-v", "-b", tmpdir, "-o", "html", "-o", "rss", "xkcd"])
         finally:
             shutil.rmtree(tmpdir)
         # create a temporary directory for images
@@ -63,6 +63,6 @@ class TestDosage (unittest.TestCase):
         tmpdir = tempfile.mkdtemp()
         try:
             # fetch indexed
-            run_with_options(["-n", "2", "-v", "-b", tmpdir, "calvinandhobbes:2012/02/02"])
+            run_with_options(["-n", "2", "-v", "-b", tmpdir, "xkcd:303"])
         finally:
             shutil.rmtree(tmpdir)
diff --git a/tests/test_scraper.py b/tests/test_scraper.py
index 1c4527ded..e746dd417 100644
--- a/tests/test_scraper.py
+++ b/tests/test_scraper.py
@@ -1,5 +1,6 @@
 # -*- coding: iso-8859-1 -*-
 # Copyright (C) 2013-2014 Bastian Kleineidam
+# Copyright (C) 2015 Tobias Gruetzmacher
 from unittest import TestCase
 from dosagelib import scraper
 
@@ -15,7 +16,7 @@ class ScraperTester(TestCase):
                 "missing url in %s" % scraperobj.getName())
 
     def test_find_scraperclasses_single(self):
-        result = scraper.find_scraperclasses("CalvinAndHobbes")
+        result = scraper.find_scraperclasses("xkcd")
         self.assertEqual(len(result), 1)
 
     def test_find_scraperclasses_multi(self):