diff --git a/s3tests/fuzz/__init__.py b/s3tests/fuzz/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/s3tests/fuzz_headers.py b/s3tests/fuzz/headers.py
similarity index 99%
rename from s3tests/fuzz_headers.py
rename to s3tests/fuzz/headers.py
index e49713f..a491928 100644
--- a/s3tests/fuzz_headers.py
+++ b/s3tests/fuzz/headers.py
@@ -3,7 +3,7 @@ from boto.exception import BotoServerError
 from boto.s3.key import Key
 from httplib import BadStatusLine
 from optparse import OptionParser
-from . import common
+from .. import common
 
 import traceback
 import itertools
diff --git a/s3tests/fuzz/test/__init__.py b/s3tests/fuzz/test/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/s3tests/functional/test_fuzzer.py b/s3tests/fuzz/test/test_fuzzer.py
similarity index 99%
rename from s3tests/functional/test_fuzzer.py
rename to s3tests/fuzz/test/test_fuzzer.py
index 717b1db..fc40800 100644
--- a/s3tests/functional/test_fuzzer.py
+++ b/s3tests/fuzz/test/test_fuzzer.py
@@ -1,17 +1,17 @@
-mport sys
+import sys
 import itertools
 import nose
 import random
 import string
 import yaml
 
-from s3tests.fuzz_headers import *
+from ..headers import *
 
 from nose.tools import eq_ as eq
 from nose.tools import assert_true
 from nose.plugins.attrib import attr
 
-from .utils import assert_raises
+from ...functional.utils import assert_raises
 
 _decision_graph = {}
 
diff --git a/setup.py b/setup.py
index edcab1a..30a5df6 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ setup(
             's3tests-generate-objects = s3tests.generate_objects:main',
             's3tests-test-readwrite = s3tests.readwrite:main',
             's3tests-test-roundtrip = s3tests.roundtrip:main',
-            's3tests-fuzz-headers = s3tests.fuzz_headers:main',
+            's3tests-fuzz-headers = s3tests.fuzz.headers:main',
             ],
         },