diff --git a/.travis.yml b/.travis.yml
index afaa975..b89a103 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,9 @@ matrix:
     - os: osx
       language: generic
 
+services:
+  - docker
+
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
       brew update;
@@ -20,6 +23,15 @@ before_install:
       python setup.py install;
       cd ..;
     fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+      docker run -d -p 8080:8080 --name token_dispenser matlink/token-dispenser;
+      docker exec token_dispenser bash -c
+          "echo $GMAIL_ADDR $GMAIL_PWD > passwords/passwords.txt";
+      docker restart token_dispenser;
+      sed -i 's,^token_url=.*$,token_url=http://localhost:8080/email/gsfid,g' gplaycli.conf;
+      sed -i 's,^token_url =.*$,token_url="http://localhost:8080/email/gsfid",g'
+          tests/test_init.py;
+    fi
 
 install: pip install .
 
@@ -27,5 +39,5 @@ script: python -m pytest tests
 
 env:
   global:
-    - secure: GmiMAlU1OXaMyJBdK4x0zID+6TIaJR8SyVvcCWR7xofa+0/45DW3SfrOG7qHWVBniKwF6BOYKgLbyaNoS94OV58iMk08X9n2ksElv5JUluhVeKUQx3Owh+xy6nzw0949uvcZdXbWf3l4nOrdxE/rbf8NtGzrDcO/UF/9h2PLaP+X5xElsTijy2udbjOH/YNsUzktx11XMVyVPc5d3b43JkN9y8lPq0vPMW4dhAS2eGIsc3MPSMrG84N4oVJ+UQtc84Q6BOBpZMci2BtsLyfu0fFxicV/c1a1URV0S6IQgdS65aPhfODn6NPcrZCJ9VWlB0jW50KUU7y3Q5dRH3BK/bbUo4Cv5iLBL10giGGV7QadkAbBAtZF3ur1JQ6sQ4amNXjwQEpBhbUxEdN71qMI2sH5bMhvLjotoLuv8+roZO+x0VM21PLScYSiIMhuU0Tuahm4zKcNls0BGg13jlMc035cI8FKLwa4BlpxtxjsQebf1/7p7WAONY7tpbRExaFbuCE2JNSxwsFgssF/1tH86BHJbKAGJVbprEOEAxylfzzx6iG01o6/ExZvH+xnn373CHvEw8mMa1ygEst0GXr0EsDu3lfjYxgwuUHqYxQmhDvRYGcNYFPoE789wJpaTnntzskftc0tVKCMTvEzs3aZ4mGdMbXgQKyVy1i7vDxdumY=
-    - secure: tQz3MAaNgzFifN1LzWwZbsDS6DqmAOBtsv6VZGkkLOkoF9wL9CxAsXPG5BMJ2MHlDaq4vjOE8OCT0HMNbALCXDq7SzE08w1HgZ8Fe+RBZdWNYclr5dKOLQaDayhvqXapgobS4eiv+oQ6ugU5CS7SSj2V7FzO4mvUQn/Y2rlsQ7OS8L1Da4bjDPCqu1cxG5jfT/L63O0BNp8vffMahWV3LoPnqxyAo74vMc7jQT5rs4WscT2Ny0rsi1dLM2Tdgha2HGOmdsfHpC8qmEcTIxHOqtaG6R4bOxKgG+ZWslo6oHxG9VzxQobzRXMFwh7JDB3kUOKp7HFDK9FYp7Bu1NIEcKPNyPrAN+Q17arkrGkftpElhAu5HL0idcS8waSygWO7+2nn55eYmIc0qBOEwApWMuBs8fZOr0OUEyt6/woin6yMnxZHqMBZSz1CC/W6korCgO57CISsN4GzQFiOH1iYKFtE5ncb0HmMymdGiDxm2sKsc9OSlkzdhrzuflfchxYFZmV8WdpArWiz1M3MTzHoKSwYqYPDk744SwXJd5RdFEynn6t6NWgzLUkbqSKDNzK7Vo9wgDtAbHygxK1ORRfj/VvZaGubthHoG30LZUaBCD4VJfKb6DCHCwfOQ7cj4ZlUAoI28BYUF+wh0un/WMzASpgl2T/WtcCDUK3gxEADZHc=
+  - secure: Zdln6Bggs55vMSlm0LD6lIKXmGjxo/Z1yxhu/GC8Tr4ILL9LofX9F1lXvzxl/VjfQn0WtvY8x0JlSoQvuU8S4EZgl1WJsHAA4gD6B7Z/Tys/w3vncP8cXXmt8BXrcjkIAPMzbz++TGd0+Z8PrBosRegfXOzeQ7AkDqYTbyosx9vlpOfBVomwFjsjLKcbbuR0d2P7i5c5snp4R8Ul2f9Zmkt5DbQt8h7ywLzdO8QU2j8cOfKWahwWIeky7g9Dk/BS3lhTIGtZdHADFmSsZFa+vNW6m0I+j0VmODnyXZuMn44iGfsV5Vos34HDmKRh8y1abw0k38anP5vfOGQ+DhLZlVgHCy0RRlojCkdcOD3MRSzLdi4qSjVDzY+e+/PzMWOG80NG8CgQ4JYN4H87MxX7VcQJSEXnX0ZSNZmuX3bx/0+7HwGw2hqJYEaKnOKGOSlSefmAZXdFwAB/l9LbfCXabTxGzbpo5dW3tcDT7vJaZ+XhcLJ7eC29qQ2uHAag/+jPqN+YC1TVsGw3QDwhpmMosedPqHi2qpTg9bD7rM17+7AdzNCQu8n4/+EU+HYDkuOhD73KqzZ9K+cTeoc9PUikNC4haTcstnlMNUworzGjaHR/EOKD8L4dpInXdI5a1vqzkB9+J1BFC307HF8XhEdGrmSkMx78TndNKJXJIUP+PD4=
+  - secure: Br5cN6c+98tv0kc1mmYNT7uKlHLzqoDxoxjjhTRYdFYojS6k2T8ZNFTvBCSyQCuytNV9A1GllTHLkjnV1+LB5uirrvh7ZYlDqw4DNSqVwHdcYi2dR676GoGV/Rq3l4vXiLpy2zFnLX/Cr95wPZZjShme6+pp9i5Pa2DzjlUm4XhXDkZpBX6Bh/aa1eUembCsIxLULSRtm7P/2tjJJ2eKM43QOxcSqxrSeZXYDVet7WZv+EuvhorZUFoc95pwtTlzOur0X2uB/Tysr9MeEvXSdTmt9iRA0ftw2smLds14cOoPqsYNeag8dkqJorkigU+10llGr+P2duBsDLe8odBDJvZWoR+WkE0RcYing9Z4MOHvYxhg1nvpKuADqdsUeO8hfscw/cdHzZYOLfsnkNp5j2DhfMwCHPQ2Zuaa/841u2ameemz7q/eB7XT2CAma5z5qY8nbDm0XmbNF+4TwUO/NRsNT+czSodLH/x/UWo78HZci9206AJfC8OQvBT81MaDKCRHyb708sj/vigS3Vmuq4c3FOYcFKT9Hssjo4xDPfv9NrydufvEZkxv24QK8CVQbc/QZGM14188AVYwYfrF6lOhOD8BKEwVE8ToAqeVtblGk4wyPiBUweT+MQgGXdWTOyXLyA0HVLd/HUw3Q6NyhtOzy1xilgXzr+zNi6cULXU=
diff --git a/gplaycli/gplaycli.py b/gplaycli/gplaycli.py
index 9d005fc..2e43c46 100755
--- a/gplaycli/gplaycli.py
+++ b/gplaycli/gplaycli.py
@@ -23,6 +23,7 @@
 import configparser
 import warnings
 import json
+import time
 
 from enum import IntEnum
 
@@ -171,6 +172,7 @@ def retrieve_token(self, force_new=False):
 		server located at self.token_url.
 		"""
 		token, gsfid, device = self.get_cached_token()
+		self.retrieve_time = time.time()
 		if (token is not None
 				and not force_new
 				and device == self.device_codename):
@@ -431,6 +433,11 @@ def connect(self):
 		with warnings.catch_warnings():
 			warnings.simplefilter('error')
 			try:
+				if self.token_enable:
+					now = time.time()
+					if now - self.retrieve_time < 5:
+						# Need to wait a bit before loging in with this token
+						time.sleep(5)
 				self.api.login(email=email,
 							   password=password,
 							   authSubToken=authsub_token,
diff --git a/tests/test_cli.py b/tests/test_cli.py
index 70aaa4e..fe8f59d 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -13,7 +13,7 @@
 UPDATEAPK=os.path.join("tests", "org.mozilla.focus.20112247.apk")
 TOKENFILE=os.path.expanduser('~/.cache/gplaycli/token')
 
-RE_APPEND_VERSION=re.compile("^"+TESTAPK.replace('.', '\.')+"-v.[A-z0-9.-]+\.apk$")
+RE_APPEND_VERSION=re.compile("^"+TESTAPK.replace('.', r'\.')+r"-v.[A-z0-9.-]+\.apk$")
 
 def call(args):
 	proc = sp.run(args.split(), stdout=sp.PIPE, stderr=sp.PIPE)