diff --git a/Makefile b/Makefile
index b12f7fb77..4d1927e63 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,6 @@ HOMEPAGE:=$(HOME)/public_html/$(LAPPNAME)-webpage.git
 DEBUILDDIR:=$(HOME)/projects/debian/official
 DEBORIGFILE:=$(DEBUILDDIR)/$(LAPPNAME)_$(VERSION).orig.tar.gz
 DEBPACKAGEDIR:=$(DEBUILDDIR)/$(LAPPNAME)-$(VERSION)
-PY2APPOPTS ?=
 # Default pytest options
 # Note that using -n silently swallows test creation exceptions like
 # import errors.
@@ -129,6 +128,9 @@ localbuild:
 test:	localbuild
 	env LANG=en_US.utf-8 http_proxy="" $(PYTHON) -m pytest $(PYTESTOPTS) $(TESTOPTS) $(TESTS)
 
+testall:	localbuild
+	env LANG=en_UR.utf-8 http_proxy="" TESTALL=1 $(PYTHON) -m pytest $(PYTESTOPTS) $(TESTOPTS) $(TESTS)
+
 deb:
 # Build an official .deb package; only useful for Debian maintainers.
 # To build a local .deb package, use:
diff --git a/tests/test_comics.py b/tests/test_comics.py
index 2cbb429d2..a10715817 100644
--- a/tests/test_comics.py
+++ b/tests/test_comics.py
@@ -125,7 +125,7 @@ def make_comic_tester(name, **kwargs):
 def generate_comic_testers():
     """For each comic scraper, create a test class."""
     g = globals()
-    if "TRAVIS" in os.environ:
+    if "TESTALL" not in os.environ:
         # Get limited number of scraper tests on Travis builds.
         max_scrapers = 1
         scraperclasses = islice(scraper.get_scraperclasses(), 0, max_scrapers)