diff --git a/.travis.yml b/.travis.yml
index 869670f..f0f4f74 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
 # command to install dependencies
 # need "python setup.py install" to install resync so that client tests work
 install:
diff --git a/setup.py b/setup.py
index bb3fde3..b5ccd19 100644
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,6 @@
 """Setup for ResurceSync library and client implementation."""
 from setuptools import setup, Command
 import os
-# setuptools used instead of distutils.core so that 
-# dependencies can be handled automatically
 
 # Extract version number from resync/_version.py. Here we 
 # are very strict about the format of the version string 
@@ -53,6 +51,7 @@ setup(
                  "Programming Language :: Python :: 3.3",
                  "Programming Language :: Python :: 3.4",
                  "Programming Language :: Python :: 3.5",
+                 "Programming Language :: Python :: 3.6",
                  "Topic :: Internet :: WWW/HTTP",
                  "Topic :: Software Development :: Libraries :: Python Modules",
                  "Environment :: Web Environment"],
diff --git a/tests/test_resource_list_multifile.py b/tests/test_resource_list_multifile.py
index 533f635..f76d4e3 100644
--- a/tests/test_resource_list_multifile.py
+++ b/tests/test_resource_list_multifile.py
@@ -47,7 +47,7 @@ class TestResourceListMultifile(unittest.TestCase):
         self.assertEqual(sr[16], 'http://localhost:8888/resources/826')
 
     def test_11_write_multifile(self):
-        tempdir = tempfile.mkdtemp(prefix='test_resource_list_multifile')
+        tempdir = tempfile.mkdtemp(prefix='test_resource_list_multifile_dir')
         rl = ResourceList()
         rl.mapper = Mapper(['http://localhost/=%s/' % (tempdir)])
         rl.add(Resource(uri='http://localhost/a'))