diff --git a/setup.py b/setup.py
index d6429059..0cd7a3b7 100644
--- a/setup.py
+++ b/setup.py
@@ -68,6 +68,9 @@ def run(self):
     author_email='braxton.mckee@gmail.com',
     url='https://github.com/aprioriinvestments/typed_python',
     packages=setuptools.find_packages(),
+    package_data={
+        'typed_python': ['tests/*']
+    },
     cmdclass={'build_ext': TypedPythonBuildExtension},
     ext_modules=ext_modules,
     install_requires=INSTALL_REQUIRES,
diff --git a/typed_python/compiler/compiler_cache_test.py b/typed_python/compiler/tests/compiler_cache_test.py
similarity index 100%
rename from typed_python/compiler/compiler_cache_test.py
rename to typed_python/compiler/tests/compiler_cache_test.py
diff --git a/typed_python/compiler/llvm_compiler_test.py b/typed_python/compiler/tests/llvm_compiler_test.py
similarity index 100%
rename from typed_python/compiler/llvm_compiler_test.py
rename to typed_python/compiler/tests/llvm_compiler_test.py
diff --git a/typed_python/compiler/merge_type_wrappers_test.py b/typed_python/compiler/tests/merge_type_wrappers_test.py
similarity index 100%
rename from typed_python/compiler/merge_type_wrappers_test.py
rename to typed_python/compiler/tests/merge_type_wrappers_test.py
diff --git a/typed_python/compiler/native_ast_to_llvm_test.py b/typed_python/compiler/tests/native_ast_to_llvm_test.py
similarity index 100%
rename from typed_python/compiler/native_ast_to_llvm_test.py
rename to typed_python/compiler/tests/native_ast_to_llvm_test.py
diff --git a/typed_python/compiler/python_ast_analysis_test.py b/typed_python/compiler/tests/python_ast_analysis_test.py
similarity index 100%
rename from typed_python/compiler/python_ast_analysis_test.py
rename to typed_python/compiler/tests/python_ast_analysis_test.py
diff --git a/typed_python/Codebase_test.py b/typed_python/tests/Codebase_test.py
similarity index 100%
rename from typed_python/Codebase_test.py
rename to typed_python/tests/Codebase_test.py
diff --git a/typed_python/class_types_test.py b/typed_python/tests/class_types_test.py
similarity index 100%
rename from typed_python/class_types_test.py
rename to typed_python/tests/class_types_test.py
diff --git a/typed_python/deep_bytecount_test.py b/typed_python/tests/deep_bytecount_test.py
similarity index 100%
rename from typed_python/deep_bytecount_test.py
rename to typed_python/tests/deep_bytecount_test.py
diff --git a/typed_python/deepcopy_test.py b/typed_python/tests/deepcopy_test.py
similarity index 100%
rename from typed_python/deepcopy_test.py
rename to typed_python/tests/deepcopy_test.py
diff --git a/typed_python/forward_types_test.py b/typed_python/tests/forward_types_test.py
similarity index 100%
rename from typed_python/forward_types_test.py
rename to typed_python/tests/forward_types_test.py
diff --git a/typed_python/function_signature_test.py b/typed_python/tests/function_signature_test.py
similarity index 100%
rename from typed_python/function_signature_test.py
rename to typed_python/tests/function_signature_test.py
diff --git a/typed_python/function_types_test.py b/typed_python/tests/function_types_test.py
similarity index 100%
rename from typed_python/function_types_test.py
rename to typed_python/tests/function_types_test.py
diff --git a/typed_python/macro_test.py b/typed_python/tests/macro_test.py
similarity index 100%
rename from typed_python/macro_test.py
rename to typed_python/tests/macro_test.py
diff --git a/typed_python/module_representation_test.py b/typed_python/tests/module_representation_test.py
similarity index 100%
rename from typed_python/module_representation_test.py
rename to typed_python/tests/module_representation_test.py
diff --git a/typed_python/module_test.py b/typed_python/tests/module_test.py
similarity index 100%
rename from typed_python/module_test.py
rename to typed_python/tests/module_test.py
diff --git a/typed_python/python_ast_test.py b/typed_python/tests/python_ast_test.py
similarity index 100%
rename from typed_python/python_ast_test.py
rename to typed_python/tests/python_ast_test.py
diff --git a/typed_python/type_function_test.py b/typed_python/tests/type_function_test.py
similarity index 100%
rename from typed_python/type_function_test.py
rename to typed_python/tests/type_function_test.py
diff --git a/typed_python/type_identity_test.py b/typed_python/tests/type_identity_test.py
similarity index 100%
rename from typed_python/type_identity_test.py
rename to typed_python/tests/type_identity_test.py
diff --git a/typed_python/typed_queue_test.py b/typed_python/tests/typed_queue_test.py
similarity index 100%
rename from typed_python/typed_queue_test.py
rename to typed_python/tests/typed_queue_test.py
diff --git a/typed_python/types_metadata_test.py b/typed_python/tests/types_metadata_test.py
similarity index 100%
rename from typed_python/types_metadata_test.py
rename to typed_python/tests/types_metadata_test.py
diff --git a/typed_python/types_named_tuple_test.py b/typed_python/tests/types_named_tuple_test.py
similarity index 100%
rename from typed_python/types_named_tuple_test.py
rename to typed_python/tests/types_named_tuple_test.py
diff --git a/typed_python/types_serialization_format_test.py b/typed_python/tests/types_serialization_format_test.py
similarity index 100%
rename from typed_python/types_serialization_format_test.py
rename to typed_python/tests/types_serialization_format_test.py
diff --git a/typed_python/types_serialization_test.py b/typed_python/tests/types_serialization_test.py
similarity index 100%
rename from typed_python/types_serialization_test.py
rename to typed_python/tests/types_serialization_test.py
diff --git a/typed_python/types_test.py b/typed_python/tests/types_test.py
similarity index 100%
rename from typed_python/types_test.py
rename to typed_python/tests/types_test.py