diff --git a/README.rst b/README.rst
index 2a31d5d..4546bd3 100644
--- a/README.rst
+++ b/README.rst
@@ -73,7 +73,7 @@ Once you have that, you can run the tests with::
 
 You can specify what test(s) to run::
 
-	S3TEST_CONF=your.conf ./virtualenv/bin/nosetests test_s3:test_object_acl_grant_public_read
+	S3TEST_CONF=your.conf ./virtualenv/bin/nosetests s3tests.functional.test_s3:test_object_acl_grant_public_read
 
 Some tests have attributes set based on their current reliability and
 things like AWS not enforcing their spec stricly. You can filter tests
diff --git a/s3tests/__init__.py b/s3tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/AnonymousAuth.py b/s3tests/functional/AnonymousAuth.py
similarity index 100%
rename from AnonymousAuth.py
rename to s3tests/functional/AnonymousAuth.py
diff --git a/s3tests/functional/__init__.py b/s3tests/functional/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/test_s3.py b/s3tests/functional/test_s3.py
similarity index 100%
rename from test_s3.py
rename to s3tests/functional/test_s3.py
diff --git a/utils.py b/s3tests/functional/utils.py
similarity index 100%
rename from utils.py
rename to s3tests/functional/utils.py