diff --git a/end_to_end_tests/golden-record/my_test_api_client/__init__.py b/end_to_end_tests/golden-record/my_test_api_client/__init__.py
index c8d0f1760..0f240c245 100644
--- a/end_to_end_tests/golden-record/my_test_api_client/__init__.py
+++ b/end_to_end_tests/golden-record/my_test_api_client/__init__.py
@@ -1 +1,2 @@
 """ A client library for accessing My Test API """
+from .client import AuthenticatedClient, Client
diff --git a/end_to_end_tests/golden-record/my_test_api_client/models/__init__.py b/end_to_end_tests/golden-record/my_test_api_client/models/__init__.py
index 9f38702e3..5cf14bb24 100644
--- a/end_to_end_tests/golden-record/my_test_api_client/models/__init__.py
+++ b/end_to_end_tests/golden-record/my_test_api_client/models/__init__.py
@@ -1 +1,9 @@
 """ Contains all the data models used in inputs/outputs """
+
+from .a_model import AModel
+from .an_enum import AnEnum
+from .an_int_enum import AnIntEnum
+from .body_upload_file_tests_upload_post import BodyUploadFileTestsUploadPost
+from .different_enum import DifferentEnum
+from .http_validation_error import HTTPValidationError
+from .validation_error import ValidationError
diff --git a/openapi_python_client/__init__.py b/openapi_python_client/__init__.py
index 2fcca23b3..8d2f984a3 100644
--- a/openapi_python_client/__init__.py
+++ b/openapi_python_client/__init__.py
@@ -76,7 +76,7 @@ def update(self) -> Sequence[GeneratorError]:
 
     def _reformat(self) -> None:
         subprocess.run(
-            "autoflake -i -r --remove-all-unused-imports --remove-unused-variables .",
+            "autoflake -i -r --remove-all-unused-imports --remove-unused-variables --ignore-init-module-imports .",
             cwd=self.package_dir,
             shell=True,
             stdout=subprocess.PIPE,
diff --git a/tests/test___init__.py b/tests/test___init__.py
index d7970e054..aa5a3af43 100644
--- a/tests/test___init__.py
+++ b/tests/test___init__.py
@@ -382,7 +382,7 @@ def test__reformat(mocker):
     sub_run.assert_has_calls(
         [
             mocker.call(
-                "autoflake -i -r --remove-all-unused-imports --remove-unused-variables .",
+                "autoflake -i -r --remove-all-unused-imports --remove-unused-variables --ignore-init-module-imports .",
                 cwd=project.package_dir,
                 shell=True,
                 stdout=subprocess.PIPE,