diff --git a/dbt-athena-community/pyproject.toml b/dbt-athena-community/pyproject.toml
index 95619298..65878b0a 100644
--- a/dbt-athena-community/pyproject.toml
+++ b/dbt-athena-community/pyproject.toml
@@ -23,7 +23,7 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
 ]
-dependencies=["dbt-athena>=1.0.0b2,<2.0"]
+dependencies=["dbt-athena @ {root:uri}/../dbt-athena"]
 [project.urls]
 Homepage = "https://github.com/dbt-labs/dbt-athena/dbt-athena"
 Documentation = "https://docs.getdbt.com"
@@ -40,6 +40,9 @@ include = ["src/dbt"]
 [tool.hatch.build.targets.wheel]
 packages = ["src/dbt"]
 
+[tool.hatch.metadata]
+allow-direct-references = true
+
 [tool.hatch.version]
 path = "src/dbt/adapters/athena/__version__.py"
 
@@ -58,8 +61,8 @@ dependencies = [
 [tool.hatch.envs.default.scripts]
 setup = "pre-commit install"
 code-quality = "pre-commit run --all-files"
-unit-tests = "pytest --cov=dbt --cov-report=html:htmlcov {args:tests/unit}"
-integration-tests = "python -m pytest -n auto {args:tests/functional}"
+unit-tests = "pytest --cov=dbt --cov-report=html:htmlcov {args:../dbt-athena/tests/unit}"
+integration-tests = "python -m pytest -n auto {args:../dbt-athena/tests/functional}"
 
 [tool.hatch.envs.build]
 detached = true
@@ -75,20 +78,20 @@ check-all = [
 ]
 check-wheel = [
     "twine check dist/*",
-    "find ./dist/dbt_athena-*.whl -maxdepth 1 -type f | xargs python -m pip install --force-reinstall --find-links=dist/",
-    "pip freeze | grep dbt-athena",
+    "find ./dist/dbt_athena_community-*.whl -maxdepth 1 -type f | xargs python -m pip install --force-reinstall --find-links=dist/",
+    "pip freeze | grep dbt-athena-community",
 ]
 check-sdist = [
     "check-wheel-contents dist/*.whl --ignore W007,W008",
-    "find ./dist/dbt_athena-*.gz -maxdepth 1 -type f | xargs python -m pip install --force-reinstall --find-links=dist/",
-    "pip freeze | grep dbt-athena",
+    "find ./dist/dbt_athena_community-*.gz -maxdepth 1 -type f | xargs python -m pip install --force-reinstall --find-links=dist/",
+    "pip freeze | grep dbt-athena-community",
 ]
 
 [tool.pytest]
-env_files = ["test.env"]
+env_files = ["../dbt-athena/test.env"]
 testpaths = [
-    "tests/unit",
-    "tests/functional",
+    "../dbt-athena/tests/unit",
+    "../dbt-athena/tests/functional",
 ]
 filterwarnings = [
     "ignore:.*'soft_unicode' has been renamed to 'soft_str'*:DeprecationWarning",
diff --git a/dbt-athena-community/src/dbt/__init__.py b/dbt-athena-community/src/dbt/__init__.py
new file mode 100644
index 00000000..12a55697
--- /dev/null
+++ b/dbt-athena-community/src/dbt/__init__.py
@@ -0,0 +1 @@
+# don't extend the path the way we normally would because this doesn't need to be discoverable
diff --git a/dbt-athena-community/src/dbt/adapters/athena_community/__init__.py b/dbt-athena-community/src/dbt/adapters/athena_community/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/dbt-athena-community/src/dbt/adapters/athena_community/__version__.py b/dbt-athena-community/src/dbt/adapters/athena_community/__version__.py
new file mode 100644
index 00000000..f2493fc9
--- /dev/null
+++ b/dbt-athena-community/src/dbt/adapters/athena_community/__version__.py
@@ -0,0 +1 @@
+version = "1.8.4"
diff --git a/dbt-athena-community/test.env.example b/dbt-athena-community/test.env.example
deleted file mode 100644
index 7182e9c0..00000000
--- a/dbt-athena-community/test.env.example
+++ /dev/null
@@ -1,10 +0,0 @@
-DBT_TEST_ATHENA_S3_STAGING_DIR=
-DBT_TEST_ATHENA_S3_TMP_TABLE_DIR=
-DBT_TEST_ATHENA_REGION_NAME=
-DBT_TEST_ATHENA_THREADS=
-DBT_TEST_ATHENA_POLL_INTERVAL=
-DBT_TEST_ATHENA_DATABASE=
-DBT_TEST_ATHENA_SCHEMA=
-DBT_TEST_ATHENA_WORK_GROUP=
-DBT_TEST_ATHENA_AWS_PROFILE_NAME=
-DBT_TEST_ATHENA_SPARK_WORK_GROUP=