diff --git a/.travis.yml b/.travis.yml
index a7da072d..203af806 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,14 @@
 sudo: false
 language: python
 python:
-  - "3.3"
-  - "3.4"
-  - "3.5"
+  - 3.3
+  - 3.4
+  - 3.5
+  - 3.6
 install:
   - pip install -r requirements.txt
 script:
-  - if [[ $TRAVIS_PYTHON_VERSION != '3.3' ]]; then nosetests --ignore-files=test_extractors --verbose test; fi
-  - if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then nosetests --verbose test; fi
+  - if [[ $TRAVIS_PYTHON_VERSION != '3.6' ]]; then nosetests --ignore-files=test_extractors --verbose test; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then nosetests --verbose test; fi
+git:
+  depth: 10
diff --git a/gallery_dl/cache.py b/gallery_dl/cache.py
index d134d854..63c24681 100644
--- a/gallery_dl/cache.py
+++ b/gallery_dl/cache.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2016 Mike Fährmann
+# Copyright 2016-2017 Mike Fährmann
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -123,7 +123,10 @@ class DatabaseCache(CacheModule):
         key, timestamp = key
         try:
             cursor = self.db.cursor()
-            cursor.execute("BEGIN EXCLUSIVE")
+            try:
+                cursor.execute("BEGIN EXCLUSIVE")
+            except sqlite3.OperationalError:
+                """workaround for python 3.6"""
             cursor.execute("SELECT value, expires FROM data WHERE key=?", (key,))
             value, expires = cursor.fetchone()
             if timestamp < expires:
diff --git a/test/test_extractors.py b/test/test_extractors.py
index 3847df45..3521387e 100644
--- a/test/test_extractors.py
+++ b/test/test_extractors.py
@@ -56,7 +56,7 @@ if __name__ == '__main__' and len(sys.argv) > 1:
     ]
     del sys.argv[1:]
 
-skip = ("exhentai", "kissmanga")
+skip = ("deviantart"1, "kissmanga")
 for extr in extractors:
     if extr.category in skip:
         continue