--- a/script/lib/tweetstream/conftest.py	Tue Dec 18 10:40:15 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# content of conftest.py
-
-import pytest
-def pytest_addoption(parser):
-    parser.addoption("--runslow", action="store_true",
-        help="run slow tests")
-
-def pytest_runtest_setup(item):
-    if 'slow' in item.keywords and not item.config.getvalue("runslow"):
-        pytest.skip("need --runslow option to run")
\ No newline at end of file