diff --git a/integration/conftest.py b/integration/conftest.py
index 33e7998c1..581fcb72c 100644
--- a/integration/conftest.py
+++ b/integration/conftest.py
@@ -451,10 +451,8 @@ def chutney(reactor, temp_dir):
     chutney_dir = join(temp_dir, 'chutney')
     mkdir(chutney_dir)
 
-    # TODO:
-
-    # check for 'tor' binary explicitly and emit a "skip" if we can't
-    # find it
+    if not which("tor"):
+        pytest.skip("tor command-line tool is not available")
 
     # XXX yuck! should add a setup.py to chutney so we can at least
     # "pip install <path to tarball>" and/or depend on chutney in "pip