diff --git a/.travis.yml b/.travis.yml
index 55b630c1c..a9e03d2de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ script:
 
 env:
   - TOX_ENV=pydef
-  - TOX_ENV=plugins
+#  - TOX_ENV=plugins
   - TOX_ENV=flake8
   - TOX_ENV=flake8-complexity
   - TOX_ENV=isort
diff --git a/deluge/tests/test_client.py b/deluge/tests/test_client.py
index 2d56bc95f..7a0ed2045 100644
--- a/deluge/tests/test_client.py
+++ b/deluge/tests/test_client.py
@@ -4,7 +4,7 @@ from twisted.trial import unittest
 
 from deluge import error
 from deluge.core.authmanager import AUTH_LEVEL_ADMIN
-from deluge.ui.client import client, Client, DaemonSSLProxy
+from deluge.ui.client import Client, client, DaemonSSLProxy
 
 from . import common
 
diff --git a/deluge/ui/web/json_api.py b/deluge/ui/web/json_api.py
index 254d3b465..449d59eb7 100644
--- a/deluge/ui/web/json_api.py
+++ b/deluge/ui/web/json_api.py
@@ -29,7 +29,7 @@ from deluge import component, httpdownloader
 from deluge.common import is_magnet
 from deluge.configmanager import ConfigManager, get_config_dir
 from deluge.ui import common as uicommon
-from deluge.ui.client import client, Client
+from deluge.ui.client import Client, client
 from deluge.ui.coreconfig import CoreConfig
 from deluge.ui.sessionproxy import SessionProxy
 from deluge.ui.web.common import _, compress
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 3af1381f2..bf58b640e 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -14,7 +14,6 @@ import os
 import sys
 from datetime import date
 
-import mock
 import pkg_resources
 
 try:
diff --git a/tox.ini b/tox.ini
index 147613edf..4643ddc21 100644
--- a/tox.ini
+++ b/tox.ini
@@ -57,9 +57,9 @@ commands=
     python -c "import libtorrent as lt; print lt.version"
     py.test deluge/tests
 
-# [testenv:plugins]
-# commands=
-#    py.test deluge/plugins
+[testenv:plugins]
+commands=
+    py.test deluge/plugins
 
 [testenv:py26]
 basepython=python2.6