diff --git a/.gitignore b/.gitignore
index 6381bd5f..2134ba3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,3 +58,6 @@ dist
 .vscode
 .ipynb_checkpoints
 _modules
+.tox/
+.python-version
+
diff --git a/kmapper/kmapper.py b/kmapper/kmapper.py
index da52e724..6465e4cd 100644
--- a/kmapper/kmapper.py
+++ b/kmapper/kmapper.py
@@ -500,15 +500,12 @@ def map(
         # we consider clustering or skipping it.
         cluster_params = clusterer.get_params()
 
-        if precomputed:
-            min_cluster_samples = 2
-        else:
-            min_cluster_samples = cluster_params.get(
-                "n_clusters",
-                cluster_params.get(
-                    "min_cluster_size", cluster_params.get("min_samples", 1)
-                ),
-            )
+        min_cluster_samples = cluster_params.get(
+            "n_clusters",
+            cluster_params.get(
+                "min_cluster_size", cluster_params.get("min_samples", 2)
+            ),
+        )
 
         if self.verbose > 1:
             print(
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..1f12542c
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,7 @@
+[tox]
+envlist = py27, py34, py35, py36, py37, py38
+
+[testenv]
+deps = pytest
+commands = pytest {posargs}
+extras = testing