diff --git a/.travis.yml b/.travis.yml
index 7567504d..b27dd814 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ python:
 sudo: false
 cache: pip
 install:
+- pip install -U setuptools pip
 - python setup.py install
 - pip install -rdev-requirements.txt
 script:
diff --git a/tests/conftest.py b/tests/conftest.py
index 2ecd7764..1f20880c 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
+import gc
 import pytest
 import socket
 import asyncio
@@ -228,6 +228,7 @@ def run_around_tests(monkeypatch, port_manager, controller, config):
         shutil.rmtree(tmppath)
     except:
         pass
+    gc.collect()
 
 
 @pytest.fixture