diff --git a/.travis.yml b/.travis.yml
index 879763e..e8cb9dc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,4 +8,4 @@ install:
 script:
   - ./test.py --with-coverage -v
 after_success:
-  coveralls
+  cd tests && coveralls
diff --git a/test.py b/test.py
index 56278de..e85925e 100755
--- a/test.py
+++ b/test.py
@@ -35,8 +35,8 @@ def main():
     env = os.environ.copy()
     env['PYTHONPATH'] = REPO_ROOT
     args = sys.argv[1:]
-    if len(args) > 0 and args[0] == '--with-coverage':
-        args.pop(0)
+    if len(args) > 0 and '--with-coverage' in args:
+        args.remove('--with-coverage')
         command_start = ['coverage', 'run']
     else:
         command_start = [sys.executable]