diff --git a/Makefile b/Makefile
index d10332c385..8b33e447c4 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,6 @@ vendor:
 	@go mod vendor
 
 integration:
-	gotestsum --format github-actions --rerun-fails --jsonfile output.json --packages "./internal/..." -- -run "TestAcc.*" -parallel 4 -timeout=2h
+	gotestsum --format github-actions --rerun-fails --jsonfile output.json --packages "./integration/..." -- -parallel 4 -timeout=2h
 
 .PHONY: fmt lint lintcheck test testonly coverage build snapshot vendor integration
diff --git a/integration/README.md b/integration/README.md
new file mode 100644
index 0000000000..1c1d7c6f65
--- /dev/null
+++ b/integration/README.md
@@ -0,0 +1,37 @@
+# Integration tests
+
+This directory contains integration tests for the project.
+
+The tree structure generally mirrors the source code tree structure.
+
+Requirements for new files in this directory:
+* Every package **must** be named after its directory with `_test` appended
+  * Requiring a different package name for integration tests avoids aliasing with the main package.
+* Every integration test package **must** include a `main_test.go` file.
+
+These requirements are enforced by a unit test in this directory.
+
+## Running integration tests
+
+Integration tests require the following environment variables:
+* `CLOUD_ENV` - set to the cloud environment to use (e.g. `aws`, `azure`, `gcp`)
+* `DATABRICKS_HOST` - set to the Databricks workspace to use
+* `DATABRICKS_TOKEN` - set to the Databricks token to use
+
+Optional environment variables:
+* `TEST_DEFAULT_WAREHOUSE_ID` - set to the default warehouse ID to use
+* `TEST_METASTORE_ID` - set to the metastore ID to use
+* `TEST_INSTANCE_POOL_ID` - set to the instance pool ID to use
+* `TEST_BRICKS_CLUSTER_ID` - set to the cluster ID to use
+
+To run all integration tests, use the following command:
+
+```bash
+go test ./integration/...
+```
+
+Alternatively:
+
+```bash
+make integration
+```
diff --git a/internal/dashboard_assumptions_test.go b/integration/assumptions/dashboard_assumptions_test.go
similarity index 99%
rename from internal/dashboard_assumptions_test.go
rename to integration/assumptions/dashboard_assumptions_test.go
index 906efa7819..9696aa9a4e 100644
--- a/internal/dashboard_assumptions_test.go
+++ b/integration/assumptions/dashboard_assumptions_test.go
@@ -1,4 +1,4 @@
-package internal
+package assumptions_test
 
 import (
 	"encoding/base64"
diff --git a/integration/assumptions/main_test.go b/integration/assumptions/main_test.go
new file mode 100644
index 0000000000..be27613858
--- /dev/null
+++ b/integration/assumptions/main_test.go
@@ -0,0 +1,13 @@
+package assumptions_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}
diff --git a/internal/bundle/artifacts_test.go b/integration/bundle/artifacts_test.go
similarity index 99%
rename from internal/bundle/artifacts_test.go
rename to integration/bundle/artifacts_test.go
index 7c8954a0cc..942c4c975c 100644
--- a/internal/bundle/artifacts_test.go
+++ b/integration/bundle/artifacts_test.go
@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"fmt"
diff --git a/internal/bundle/basic_test.go b/integration/bundle/basic_test.go
similarity index 98%
rename from internal/bundle/basic_test.go
rename to integration/bundle/basic_test.go
index 13da6da9ba..77befb5d0c 100644
--- a/internal/bundle/basic_test.go
+++ b/integration/bundle/basic_test.go
@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"os"
diff --git a/internal/bundle/bind_resource_test.go b/integration/bundle/bind_resource_test.go
similarity index 99%
rename from internal/bundle/bind_resource_test.go
rename to integration/bundle/bind_resource_test.go
index 7f8151ee9a..374c6f346e 100644
--- a/internal/bundle/bind_resource_test.go
+++ b/integration/bundle/bind_resource_test.go
@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"fmt"
diff --git a/internal/bundle/bundles/artifact_path_with_volume/databricks_template_schema.json b/integration/bundle/bundles/artifact_path_with_volume/databricks_template_schema.json
similarity index 100%
rename from internal/bundle/bundles/artifact_path_with_volume/databricks_template_schema.json
rename to integration/bundle/bundles/artifact_path_with_volume/databricks_template_schema.json
diff --git a/internal/bundle/bundles/artifact_path_with_volume/template/databricks.yml.tmpl b/integration/bundle/bundles/artifact_path_with_volume/template/databricks.yml.tmpl
similarity index 100%
rename from internal/bundle/bundles/artifact_path_with_volume/template/databricks.yml.tmpl
rename to integration/bundle/bundles/artifact_path_with_volume/template/databricks.yml.tmpl
diff --git a/internal/bundle/bundles/basic/databricks_template_schema.json b/integration/bundle/bundles/basic/databricks_template_schema.json
similarity index 100%
rename from internal/bundle/bundles/basic/databricks_template_schema.json
rename to integration/bundle/bundles/basic/databricks_template_schema.json
diff --git a/internal/bundle/bundles/basic/template/databricks.yml.tmpl b/integration/bundle/bundles/basic/template/databricks.yml.tmpl
similarity index 100%
rename from internal/bundle/bundles/basic/template/databricks.yml.tmpl
rename to integration/bundle/bundles/basic/template/databricks.yml.tmpl
diff --git a/internal/bundle/bundles/basic/template/hello_world.py b/integration/bundle/bundles/basic/template/hello_world.py
similarity index 100%
rename from internal/bundle/bundles/basic/template/hello_world.py
rename to integration/bundle/bundles/basic/template/hello_world.py
diff --git a/internal/bundle/bundles/clusters/databricks_template_schema.json b/integration/bundle/bundles/clusters/databricks_template_schema.json
similarity index 100%
rename from internal/bundle/bundles/clusters/databricks_template_schema.json
rename to integration/bundle/bundles/clusters/databricks_template_schema.json
diff --git a/internal/bundle/bundles/clusters/template/databricks.yml.tmpl b/integration/bundle/bundles/clusters/template/databricks.yml.tmpl
similarity index 100%
rename from internal/bundle/bundles/clusters/template/databricks.yml.tmpl
rename to integration/bundle/bundles/clusters/template/databricks.yml.tmpl
diff --git a/internal/bundle/bundles/clusters/template/hello_world.py b/integration/bundle/bundles/clusters/template/hello_world.py
similarity index 100%
rename from internal/bundle/bundles/clusters/template/hello_world.py
rename to integration/bundle/bundles/clusters/template/hello_world.py
diff --git a/internal/bundle/bundles/dashboards/databricks_template_schema.json b/integration/bundle/bundles/dashboards/databricks_template_schema.json
similarity index 100%
rename from internal/bundle/bundles/dashboards/databricks_template_schema.json
rename to integration/bundle/bundles/dashboards/databricks_template_schema.json
diff --git a/internal/bundle/bundles/dashboards/template/dashboard.lvdash.json b/integration/bundle/bundles/dashboards/template/dashboard.lvdash.json
similarity index 100%
rename from internal/bundle/bundles/dashboards/template/dashboard.lvdash.json
rename to integration/bundle/bundles/dashboards/template/dashboard.lvdash.json
diff --git a/internal/bundle/bundles/dashboards/template/databricks.yml.tmpl b/integration/bundle/bundles/dashboards/template/databricks.yml.tmpl
similarity index 100%
rename from internal/bundle/bundles/dashboards/template/databricks.yml.tmpl
rename to integration/bundle/bundles/dashboards/template/databricks.yml.tmpl
diff --git a/internal/bundle/bundles/deploy_then_remove_resources/databricks_template_schema.json b/integration/bundle/bundles/deploy_then_remove_resources/databricks_template_schema.json
similarity index 100%
rename from internal/bundle/bundles/deploy_then_remove_resources/databricks_template_schema.json
rename to integration/bundle/bundles/deploy_then_remove_resources/databricks_template_schema.json
diff --git a/internal/bundle/bundles/deploy_then_remove_resources/template/bar.py b/integration/bundle/bundles/deploy_then_remove_resources/template/bar.py
similarity index 100%
rename from internal/bundle/bundles/deploy_then_remove_resources/template/bar.py
rename to integration/bundle/bundles/deploy_then_remove_resources/template/bar.py
diff --git a/internal/bundle/bundles/deploy_then_remove_resources/template/databricks.yml.tmpl b/integration/bundle/bundles/deploy_then_remove_resources/template/databricks.yml.tmpl
similarity index 100%
rename from internal/bundle/bundles/deploy_then_remove_resources/template/databricks.yml.tmpl
rename to integration/bundle/bundles/deploy_then_remove_resources/template/databricks.yml.tmpl
diff --git a/internal/bundle/bundles/deploy_then_remove_resources/template/foo.py b/integration/bundle/bundles/deploy_then_remove_resources/template/foo.py
similarity index 100%
rename from internal/bundle/bundles/deploy_then_remove_resources/template/foo.py
rename to integration/bundle/bundles/deploy_then_remove_resources/template/foo.py
diff --git a/internal/bundle/bundles/deploy_then_remove_resources/template/resources.yml.tmpl b/integration/bundle/bundles/deploy_then_remove_resources/template/resources.yml.tmpl
similarity index 100%
rename from internal/bundle/bundles/deploy_then_remove_resources/template/resources.yml.tmpl
rename to integration/bundle/bundles/deploy_then_remove_resources/template/resources.yml.tmpl
diff --git a/internal/bundle/bundles/job_metadata/databricks_template_schema.json b/integration/bundle/bundles/job_metadata/databricks_template_schema.json
similarity index 100%
rename from internal/bundle/bundles/job_metadata/databricks_template_schema.json
rename to integration/bundle/bundles/job_metadata/databricks_template_schema.json
diff --git a/internal/bundle/bundles/job_metadata/template/a/b/bar.py b/integration/bundle/bundles/job_metadata/template/a/b/bar.py
similarity index 100%
rename from internal/bundle/bundles/job_metadata/template/a/b/bar.py
rename to integration/bundle/bundles/job_metadata/template/a/b/bar.py
diff --git a/internal/bundle/bundles/job_metadata/template/a/b/resources.yml.tmpl b/integration/bundle/bundles/job_metadata/template/a/b/resources.yml.tmpl
similarity index 100%
rename from internal/bundle/bundles/job_metadata/template/a/b/resources.yml.tmpl
rename to integration/bundle/bundles/job_metadata/template/a/b/resources.yml.tmpl
diff --git a/internal/bundle/bundles/job_metadata/template/databricks.yml.tmpl b/integration/bundle/bundles/job_metadata/template/databricks.yml.tmpl
similarity index 100%
rename from internal/bundle/bundles/job_metadata/template/databricks.yml.tmpl
rename to integration/bundle/bundles/job_metadata/template/databricks.yml.tmpl
diff --git a/internal/bundle/bundles/job_metadata/template/foo.py b/integration/bundle/bundles/job_metadata/template/foo.py
similarity index 100%
rename from internal/bundle/bundles/job_metadata/template/foo.py
rename to integration/bundle/bundles/job_metadata/template/foo.py
diff --git a/internal/bundle/bundles/python_wheel_task/databricks_template_schema.json b/integration/bundle/bundles/python_wheel_task/databricks_template_schema.json
similarity index 100%
rename from internal/bundle/bundles/python_wheel_task/databricks_template_schema.json
rename to integration/bundle/bundles/python_wheel_task/databricks_template_schema.json
diff --git a/internal/bundle/bundles/python_wheel_task/template/databricks.yml.tmpl b/integration/bundle/bundles/python_wheel_task/template/databricks.yml.tmpl
similarity index 100%
rename from internal/bundle/bundles/python_wheel_task/template/databricks.yml.tmpl
rename to integration/bundle/bundles/python_wheel_task/template/databricks.yml.tmpl
diff --git a/internal/bundle/bundles/python_wheel_task/template/setup.py.tmpl b/integration/bundle/bundles/python_wheel_task/template/setup.py.tmpl
similarity index 100%
rename from internal/bundle/bundles/python_wheel_task/template/setup.py.tmpl
rename to integration/bundle/bundles/python_wheel_task/template/setup.py.tmpl
diff --git a/internal/bundle/bundles/python_wheel_task/template/{{.project_name}}/__init__.py b/integration/bundle/bundles/python_wheel_task/template/{{.project_name}}/__init__.py
similarity index 100%
rename from internal/bundle/bundles/python_wheel_task/template/{{.project_name}}/__init__.py
rename to integration/bundle/bundles/python_wheel_task/template/{{.project_name}}/__init__.py
diff --git a/internal/bundle/bundles/python_wheel_task/template/{{.project_name}}/__main__.py b/integration/bundle/bundles/python_wheel_task/template/{{.project_name}}/__main__.py
similarity index 100%
rename from internal/bundle/bundles/python_wheel_task/template/{{.project_name}}/__main__.py
rename to integration/bundle/bundles/python_wheel_task/template/{{.project_name}}/__main__.py
diff --git a/internal/bundle/bundles/python_wheel_task_with_cluster/databricks_template_schema.json b/integration/bundle/bundles/python_wheel_task_with_cluster/databricks_template_schema.json
similarity index 100%
rename from internal/bundle/bundles/python_wheel_task_with_cluster/databricks_template_schema.json
rename to integration/bundle/bundles/python_wheel_task_with_cluster/databricks_template_schema.json
diff --git a/internal/bundle/bundles/python_wheel_task_with_cluster/template/databricks.yml.tmpl b/integration/bundle/bundles/python_wheel_task_with_cluster/template/databricks.yml.tmpl
similarity index 100%
rename from internal/bundle/bundles/python_wheel_task_with_cluster/template/databricks.yml.tmpl
rename to integration/bundle/bundles/python_wheel_task_with_cluster/template/databricks.yml.tmpl
diff --git a/internal/bundle/bundles/python_wheel_task_with_cluster/template/setup.py.tmpl b/integration/bundle/bundles/python_wheel_task_with_cluster/template/setup.py.tmpl
similarity index 100%
rename from internal/bundle/bundles/python_wheel_task_with_cluster/template/setup.py.tmpl
rename to integration/bundle/bundles/python_wheel_task_with_cluster/template/setup.py.tmpl
diff --git a/internal/bundle/bundles/python_wheel_task_with_cluster/template/{{.project_name}}/__init__.py b/integration/bundle/bundles/python_wheel_task_with_cluster/template/{{.project_name}}/__init__.py
similarity index 100%
rename from internal/bundle/bundles/python_wheel_task_with_cluster/template/{{.project_name}}/__init__.py
rename to integration/bundle/bundles/python_wheel_task_with_cluster/template/{{.project_name}}/__init__.py
diff --git a/internal/bundle/bundles/python_wheel_task_with_cluster/template/{{.project_name}}/__main__.py b/integration/bundle/bundles/python_wheel_task_with_cluster/template/{{.project_name}}/__main__.py
similarity index 100%
rename from internal/bundle/bundles/python_wheel_task_with_cluster/template/{{.project_name}}/__main__.py
rename to integration/bundle/bundles/python_wheel_task_with_cluster/template/{{.project_name}}/__main__.py
diff --git a/internal/bundle/bundles/python_wheel_task_with_environments/databricks_template_schema.json b/integration/bundle/bundles/python_wheel_task_with_environments/databricks_template_schema.json
similarity index 100%
rename from internal/bundle/bundles/python_wheel_task_with_environments/databricks_template_schema.json
rename to integration/bundle/bundles/python_wheel_task_with_environments/databricks_template_schema.json
diff --git a/internal/bundle/bundles/python_wheel_task_with_environments/template/databricks.yml.tmpl b/integration/bundle/bundles/python_wheel_task_with_environments/template/databricks.yml.tmpl
similarity index 100%
rename from internal/bundle/bundles/python_wheel_task_with_environments/template/databricks.yml.tmpl
rename to integration/bundle/bundles/python_wheel_task_with_environments/template/databricks.yml.tmpl
diff --git a/internal/bundle/bundles/python_wheel_task_with_environments/template/setup.py.tmpl b/integration/bundle/bundles/python_wheel_task_with_environments/template/setup.py.tmpl
similarity index 100%
rename from internal/bundle/bundles/python_wheel_task_with_environments/template/setup.py.tmpl
rename to integration/bundle/bundles/python_wheel_task_with_environments/template/setup.py.tmpl
diff --git a/internal/bundle/bundles/python_wheel_task_with_environments/template/{{.project_name}}/__init__.py b/integration/bundle/bundles/python_wheel_task_with_environments/template/{{.project_name}}/__init__.py
similarity index 100%
rename from internal/bundle/bundles/python_wheel_task_with_environments/template/{{.project_name}}/__init__.py
rename to integration/bundle/bundles/python_wheel_task_with_environments/template/{{.project_name}}/__init__.py
diff --git a/internal/bundle/bundles/python_wheel_task_with_environments/template/{{.project_name}}/__main__.py b/integration/bundle/bundles/python_wheel_task_with_environments/template/{{.project_name}}/__main__.py
similarity index 100%
rename from internal/bundle/bundles/python_wheel_task_with_environments/template/{{.project_name}}/__main__.py
rename to integration/bundle/bundles/python_wheel_task_with_environments/template/{{.project_name}}/__main__.py
diff --git a/internal/bundle/bundles/recreate_pipeline/databricks_template_schema.json b/integration/bundle/bundles/recreate_pipeline/databricks_template_schema.json
similarity index 100%
rename from internal/bundle/bundles/recreate_pipeline/databricks_template_schema.json
rename to integration/bundle/bundles/recreate_pipeline/databricks_template_schema.json
diff --git a/internal/bundle/bundles/recreate_pipeline/template/databricks.yml.tmpl b/integration/bundle/bundles/recreate_pipeline/template/databricks.yml.tmpl
similarity index 100%
rename from internal/bundle/bundles/recreate_pipeline/template/databricks.yml.tmpl
rename to integration/bundle/bundles/recreate_pipeline/template/databricks.yml.tmpl
diff --git a/internal/bundle/bundles/recreate_pipeline/template/nb.sql b/integration/bundle/bundles/recreate_pipeline/template/nb.sql
similarity index 100%
rename from internal/bundle/bundles/recreate_pipeline/template/nb.sql
rename to integration/bundle/bundles/recreate_pipeline/template/nb.sql
diff --git a/internal/bundle/bundles/spark_jar_task/databricks_template_schema.json b/integration/bundle/bundles/spark_jar_task/databricks_template_schema.json
similarity index 100%
rename from internal/bundle/bundles/spark_jar_task/databricks_template_schema.json
rename to integration/bundle/bundles/spark_jar_task/databricks_template_schema.json
diff --git a/internal/bundle/bundles/spark_jar_task/template/databricks.yml.tmpl b/integration/bundle/bundles/spark_jar_task/template/databricks.yml.tmpl
similarity index 100%
rename from internal/bundle/bundles/spark_jar_task/template/databricks.yml.tmpl
rename to integration/bundle/bundles/spark_jar_task/template/databricks.yml.tmpl
diff --git a/internal/bundle/bundles/spark_jar_task/template/{{.project_name}}/META-INF/MANIFEST.MF b/integration/bundle/bundles/spark_jar_task/template/{{.project_name}}/META-INF/MANIFEST.MF
similarity index 100%
rename from internal/bundle/bundles/spark_jar_task/template/{{.project_name}}/META-INF/MANIFEST.MF
rename to integration/bundle/bundles/spark_jar_task/template/{{.project_name}}/META-INF/MANIFEST.MF
diff --git a/internal/bundle/bundles/spark_jar_task/template/{{.project_name}}/PrintArgs.java b/integration/bundle/bundles/spark_jar_task/template/{{.project_name}}/PrintArgs.java
similarity index 100%
rename from internal/bundle/bundles/spark_jar_task/template/{{.project_name}}/PrintArgs.java
rename to integration/bundle/bundles/spark_jar_task/template/{{.project_name}}/PrintArgs.java
diff --git a/internal/bundle/bundles/uc_schema/databricks_template_schema.json b/integration/bundle/bundles/uc_schema/databricks_template_schema.json
similarity index 100%
rename from internal/bundle/bundles/uc_schema/databricks_template_schema.json
rename to integration/bundle/bundles/uc_schema/databricks_template_schema.json
diff --git a/internal/bundle/bundles/uc_schema/template/databricks.yml.tmpl b/integration/bundle/bundles/uc_schema/template/databricks.yml.tmpl
similarity index 100%
rename from internal/bundle/bundles/uc_schema/template/databricks.yml.tmpl
rename to integration/bundle/bundles/uc_schema/template/databricks.yml.tmpl
diff --git a/internal/bundle/bundles/uc_schema/template/nb.sql b/integration/bundle/bundles/uc_schema/template/nb.sql
similarity index 100%
rename from internal/bundle/bundles/uc_schema/template/nb.sql
rename to integration/bundle/bundles/uc_schema/template/nb.sql
diff --git a/internal/bundle/bundles/uc_schema/template/schema.yml.tmpl b/integration/bundle/bundles/uc_schema/template/schema.yml.tmpl
similarity index 100%
rename from internal/bundle/bundles/uc_schema/template/schema.yml.tmpl
rename to integration/bundle/bundles/uc_schema/template/schema.yml.tmpl
diff --git a/internal/bundle/bundles/volume/databricks_template_schema.json b/integration/bundle/bundles/volume/databricks_template_schema.json
similarity index 100%
rename from internal/bundle/bundles/volume/databricks_template_schema.json
rename to integration/bundle/bundles/volume/databricks_template_schema.json
diff --git a/internal/bundle/bundles/volume/template/databricks.yml.tmpl b/integration/bundle/bundles/volume/template/databricks.yml.tmpl
similarity index 100%
rename from internal/bundle/bundles/volume/template/databricks.yml.tmpl
rename to integration/bundle/bundles/volume/template/databricks.yml.tmpl
diff --git a/internal/bundle/bundles/volume/template/nb.sql b/integration/bundle/bundles/volume/template/nb.sql
similarity index 100%
rename from internal/bundle/bundles/volume/template/nb.sql
rename to integration/bundle/bundles/volume/template/nb.sql
diff --git a/internal/bundle/bundles/with_includes/databricks_template_schema.json b/integration/bundle/bundles/with_includes/databricks_template_schema.json
similarity index 100%
rename from internal/bundle/bundles/with_includes/databricks_template_schema.json
rename to integration/bundle/bundles/with_includes/databricks_template_schema.json
diff --git a/internal/bundle/bundles/with_includes/template/databricks.yml.tmpl b/integration/bundle/bundles/with_includes/template/databricks.yml.tmpl
similarity index 100%
rename from internal/bundle/bundles/with_includes/template/databricks.yml.tmpl
rename to integration/bundle/bundles/with_includes/template/databricks.yml.tmpl
diff --git a/internal/bundle/clusters_test.go b/integration/bundle/clusters_test.go
similarity index 98%
rename from internal/bundle/clusters_test.go
rename to integration/bundle/clusters_test.go
index d79ded0b7d..d4b16c49b1 100644
--- a/internal/bundle/clusters_test.go
+++ b/integration/bundle/clusters_test.go
@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"fmt"
diff --git a/internal/bundle/dashboards_test.go b/integration/bundle/dashboards_test.go
similarity index 99%
rename from internal/bundle/dashboards_test.go
rename to integration/bundle/dashboards_test.go
index 82ed419b4b..cbca560fb2 100644
--- a/internal/bundle/dashboards_test.go
+++ b/integration/bundle/dashboards_test.go
@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"fmt"
diff --git a/internal/bundle/deploy_test.go b/integration/bundle/deploy_test.go
similarity index 99%
rename from internal/bundle/deploy_test.go
rename to integration/bundle/deploy_test.go
index 038705c37c..c97149b9bb 100644
--- a/internal/bundle/deploy_test.go
+++ b/integration/bundle/deploy_test.go
@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"context"
diff --git a/internal/bundle/deploy_then_remove_resources_test.go b/integration/bundle/deploy_then_remove_resources_test.go
similarity index 98%
rename from internal/bundle/deploy_then_remove_resources_test.go
rename to integration/bundle/deploy_then_remove_resources_test.go
index 0cc7ab92d4..5e0b029ccb 100644
--- a/internal/bundle/deploy_then_remove_resources_test.go
+++ b/integration/bundle/deploy_then_remove_resources_test.go
@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"os"
diff --git a/internal/bundle/deploy_to_shared_test.go b/integration/bundle/deploy_to_shared_test.go
similarity index 97%
rename from internal/bundle/deploy_to_shared_test.go
rename to integration/bundle/deploy_to_shared_test.go
index 7b8d570293..d4f1ca9875 100644
--- a/internal/bundle/deploy_to_shared_test.go
+++ b/integration/bundle/deploy_to_shared_test.go
@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"fmt"
diff --git a/internal/bundle/deployment_state_test.go b/integration/bundle/deployment_state_test.go
similarity index 99%
rename from internal/bundle/deployment_state_test.go
rename to integration/bundle/deployment_state_test.go
index caa72d0a23..98b4ef530c 100644
--- a/internal/bundle/deployment_state_test.go
+++ b/integration/bundle/deployment_state_test.go
@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"os"
diff --git a/internal/bundle/destroy_test.go b/integration/bundle/destroy_test.go
similarity index 99%
rename from internal/bundle/destroy_test.go
rename to integration/bundle/destroy_test.go
index dad9c0874e..bb9beb5083 100644
--- a/internal/bundle/destroy_test.go
+++ b/integration/bundle/destroy_test.go
@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"errors"
diff --git a/internal/bundle/empty_bundle_test.go b/integration/bundle/empty_bundle_test.go
similarity index 97%
rename from internal/bundle/empty_bundle_test.go
rename to integration/bundle/empty_bundle_test.go
index 36883ae001..40dd95355c 100644
--- a/internal/bundle/empty_bundle_test.go
+++ b/integration/bundle/empty_bundle_test.go
@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"fmt"
diff --git a/internal/bundle/environments_test.go b/integration/bundle/environments_test.go
similarity index 98%
rename from internal/bundle/environments_test.go
rename to integration/bundle/environments_test.go
index 7c5b6db893..bbdc52cb24 100644
--- a/internal/bundle/environments_test.go
+++ b/integration/bundle/environments_test.go
@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"testing"
diff --git a/internal/bundle/generate_job_test.go b/integration/bundle/generate_job_test.go
similarity index 99%
rename from internal/bundle/generate_job_test.go
rename to integration/bundle/generate_job_test.go
index b254dac8c8..c466348393 100644
--- a/internal/bundle/generate_job_test.go
+++ b/integration/bundle/generate_job_test.go
@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"context"
diff --git a/internal/bundle/generate_pipeline_test.go b/integration/bundle/generate_pipeline_test.go
similarity index 99%
rename from internal/bundle/generate_pipeline_test.go
rename to integration/bundle/generate_pipeline_test.go
index 96d8d28285..4b05cc2e41 100644
--- a/internal/bundle/generate_pipeline_test.go
+++ b/integration/bundle/generate_pipeline_test.go
@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"context"
diff --git a/internal/bundle/helpers.go b/integration/bundle/helpers_test.go
similarity index 99%
rename from internal/bundle/helpers.go
rename to integration/bundle/helpers_test.go
index 0512de8732..f1c87c0ef9 100644
--- a/internal/bundle/helpers.go
+++ b/integration/bundle/helpers_test.go
@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"bytes"
diff --git a/internal/init_test.go b/integration/bundle/init_test.go
similarity index 94%
rename from internal/init_test.go
rename to integration/bundle/init_test.go
index e2d96b3e15..b1d314b531 100644
--- a/internal/init_test.go
+++ b/integration/bundle/init_test.go
@@ -1,4 +1,4 @@
-package internal
+package bundle_test
 
 import (
 	"context"
@@ -67,8 +67,8 @@ func TestAccBundleInitOnMlopsStacks(t *testing.T) {
 	testcli.RequireSuccessfulRun(t, "bundle", "init", "mlops-stacks", "--output-dir", tmpDir2, "--config-file", filepath.Join(tmpDir1, "config.json"))
 
 	// Assert that the README.md file was created
-	assert.FileExists(t, filepath.Join(tmpDir2, "repo_name", projectName, "README.md"))
-	assertLocalFileContents(t, filepath.Join(tmpDir2, "repo_name", projectName, "README.md"), fmt.Sprintf("# %s", projectName))
+	contents := testutil.ReadFile(t, filepath.Join(tmpDir2, "repo_name", projectName, "README.md"))
+	assert.Contains(t, contents, fmt.Sprintf("# %s", projectName))
 
 	// Validate the stack
 	testutil.Chdir(t, filepath.Join(tmpDir2, "repo_name", projectName))
@@ -163,6 +163,7 @@ func TestAccBundleInitHelpers(t *testing.T) {
 		testcli.RequireSuccessfulRun(t, "bundle", "init", tmpDir, "--output-dir", tmpDir2)
 
 		// Assert that the helper function was correctly computed.
-		assertLocalFileContents(t, filepath.Join(tmpDir2, "foo.txt"), test.expected)
+		contents := testutil.ReadFile(t, filepath.Join(tmpDir2, "foo.txt"))
+		assert.Contains(t, contents, test.expected)
 	}
 }
diff --git a/internal/bundle/job_metadata_test.go b/integration/bundle/job_metadata_test.go
similarity index 99%
rename from internal/bundle/job_metadata_test.go
rename to integration/bundle/job_metadata_test.go
index de11d89a6f..a8d7a927c2 100644
--- a/internal/bundle/job_metadata_test.go
+++ b/integration/bundle/job_metadata_test.go
@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"context"
diff --git a/internal/bundle/local_state_staleness_test.go b/integration/bundle/local_state_staleness_test.go
similarity index 98%
rename from internal/bundle/local_state_staleness_test.go
rename to integration/bundle/local_state_staleness_test.go
index 1c025b47a4..29283c0022 100644
--- a/internal/bundle/local_state_staleness_test.go
+++ b/integration/bundle/local_state_staleness_test.go
@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"context"
diff --git a/integration/bundle/main_test.go b/integration/bundle/main_test.go
new file mode 100644
index 0000000000..1c44d0aaf6
--- /dev/null
+++ b/integration/bundle/main_test.go
@@ -0,0 +1,13 @@
+package bundle_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}
diff --git a/internal/bundle/python_wheel_test.go b/integration/bundle/python_wheel_test.go
similarity index 99%
rename from internal/bundle/python_wheel_test.go
rename to integration/bundle/python_wheel_test.go
index 1d8647396a..3f53dc95f7 100644
--- a/internal/bundle/python_wheel_test.go
+++ b/integration/bundle/python_wheel_test.go
@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"testing"
diff --git a/internal/bundle/spark_jar_test.go b/integration/bundle/spark_jar_test.go
similarity index 99%
rename from internal/bundle/spark_jar_test.go
rename to integration/bundle/spark_jar_test.go
index c2402deb60..2dc5cbaa82 100644
--- a/internal/bundle/spark_jar_test.go
+++ b/integration/bundle/spark_jar_test.go
@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"context"
diff --git a/internal/testdata/init/field-does-not-exist/databricks_template_schema.json b/integration/bundle/testdata/init/field-does-not-exist/databricks_template_schema.json
similarity index 100%
rename from internal/testdata/init/field-does-not-exist/databricks_template_schema.json
rename to integration/bundle/testdata/init/field-does-not-exist/databricks_template_schema.json
diff --git a/internal/testdata/init/field-does-not-exist/template/bar.tmpl b/integration/bundle/testdata/init/field-does-not-exist/template/bar.tmpl
similarity index 100%
rename from internal/testdata/init/field-does-not-exist/template/bar.tmpl
rename to integration/bundle/testdata/init/field-does-not-exist/template/bar.tmpl
diff --git a/internal/bundle/validate_test.go b/integration/bundle/validate_test.go
similarity index 98%
rename from internal/bundle/validate_test.go
rename to integration/bundle/validate_test.go
index 0942275bc5..ebf525a72d 100644
--- a/internal/bundle/validate_test.go
+++ b/integration/bundle/validate_test.go
@@ -1,4 +1,4 @@
-package bundle
+package bundle_test
 
 import (
 	"context"
diff --git a/internal/alerts_test.go b/integration/cmd/alerts/alerts_test.go
similarity index 95%
rename from internal/alerts_test.go
rename to integration/cmd/alerts/alerts_test.go
index d7be16d8bb..9113f882c3 100644
--- a/internal/alerts_test.go
+++ b/integration/cmd/alerts/alerts_test.go
@@ -1,4 +1,4 @@
-package internal
+package alerts_test
 
 import (
 	"testing"
diff --git a/integration/cmd/alerts/main_test.go b/integration/cmd/alerts/main_test.go
new file mode 100644
index 0000000000..6987ade02b
--- /dev/null
+++ b/integration/cmd/alerts/main_test.go
@@ -0,0 +1,13 @@
+package alerts_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}
diff --git a/internal/api_test.go b/integration/cmd/api/api_test.go
similarity index 98%
rename from internal/api_test.go
rename to integration/cmd/api/api_test.go
index 1c7312ddbd..7242a0bfc6 100644
--- a/internal/api_test.go
+++ b/integration/cmd/api/api_test.go
@@ -1,4 +1,4 @@
-package internal
+package api_test
 
 import (
 	"encoding/json"
diff --git a/integration/cmd/api/main_test.go b/integration/cmd/api/main_test.go
new file mode 100644
index 0000000000..70d021790d
--- /dev/null
+++ b/integration/cmd/api/main_test.go
@@ -0,0 +1,13 @@
+package api_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}
diff --git a/internal/auth_describe_test.go b/integration/cmd/auth/describe_test.go
similarity index 90%
rename from internal/auth_describe_test.go
rename to integration/cmd/auth/describe_test.go
index e0b335c592..492c678676 100644
--- a/internal/auth_describe_test.go
+++ b/integration/cmd/auth/describe_test.go
@@ -1,4 +1,4 @@
-package internal
+package auth_test
 
 import (
 	"context"
@@ -14,6 +14,8 @@ import (
 func TestAuthDescribeSuccess(t *testing.T) {
 	t.Log(testutil.GetEnvOrSkipTest(t, "CLOUD_ENV"))
 
+	t.Skipf("Skipping because of https://github.com/databricks/cli/issues/2010")
+
 	stdout, _ := testcli.RequireSuccessfulRun(t, "auth", "describe")
 	outStr := stdout.String()
 
@@ -35,6 +37,8 @@ func TestAuthDescribeSuccess(t *testing.T) {
 func TestAuthDescribeFailure(t *testing.T) {
 	t.Log(testutil.GetEnvOrSkipTest(t, "CLOUD_ENV"))
 
+	t.Skipf("Skipping because of https://github.com/databricks/cli/issues/2010")
+
 	stdout, _ := testcli.RequireSuccessfulRun(t, "auth", "describe", "--profile", "nonexistent")
 	outStr := stdout.String()
 
diff --git a/integration/cmd/auth/main_test.go b/integration/cmd/auth/main_test.go
new file mode 100644
index 0000000000..97b1d740b4
--- /dev/null
+++ b/integration/cmd/auth/main_test.go
@@ -0,0 +1,13 @@
+package auth_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}
diff --git a/internal/clusters_test.go b/integration/cmd/clusters/clusters_test.go
similarity index 98%
rename from internal/clusters_test.go
rename to integration/cmd/clusters/clusters_test.go
index cc1b2aa07c..132b554f12 100644
--- a/internal/clusters_test.go
+++ b/integration/cmd/clusters/clusters_test.go
@@ -1,4 +1,4 @@
-package internal
+package clusters_test
 
 import (
 	"fmt"
diff --git a/integration/cmd/clusters/main_test.go b/integration/cmd/clusters/main_test.go
new file mode 100644
index 0000000000..ccd5660e70
--- /dev/null
+++ b/integration/cmd/clusters/main_test.go
@@ -0,0 +1,13 @@
+package clusters_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}
diff --git a/internal/fs_cat_test.go b/integration/cmd/fs/cat_test.go
similarity index 99%
rename from internal/fs_cat_test.go
rename to integration/cmd/fs/cat_test.go
index e14121feaf..67e21310b1 100644
--- a/internal/fs_cat_test.go
+++ b/integration/cmd/fs/cat_test.go
@@ -1,4 +1,4 @@
-package internal
+package fs_test
 
 import (
 	"context"
diff --git a/internal/completer_test.go b/integration/cmd/fs/completion_test.go
similarity index 97%
rename from internal/completer_test.go
rename to integration/cmd/fs/completion_test.go
index 52a1f6c08b..b90c20f789 100644
--- a/internal/completer_test.go
+++ b/integration/cmd/fs/completion_test.go
@@ -1,4 +1,4 @@
-package internal
+package fs_test
 
 import (
 	"context"
diff --git a/internal/fs_cp_test.go b/integration/cmd/fs/cp_test.go
similarity index 99%
rename from internal/fs_cp_test.go
rename to integration/cmd/fs/cp_test.go
index 16318d5c15..fa507830eb 100644
--- a/internal/fs_cp_test.go
+++ b/integration/cmd/fs/cp_test.go
@@ -1,4 +1,4 @@
-package internal
+package fs_test
 
 import (
 	"context"
diff --git a/integration/cmd/fs/helpers_test.go b/integration/cmd/fs/helpers_test.go
new file mode 100644
index 0000000000..cf46f48acd
--- /dev/null
+++ b/integration/cmd/fs/helpers_test.go
@@ -0,0 +1,46 @@
+package fs_test
+
+import (
+	"os"
+	"path"
+	"path/filepath"
+
+	"github.com/databricks/cli/internal/acc"
+	"github.com/databricks/cli/internal/testutil"
+
+	"github.com/databricks/cli/libs/filer"
+	"github.com/stretchr/testify/require"
+)
+
+func setupLocalFiler(t testutil.TestingT) (filer.Filer, string) {
+	t.Log(testutil.GetEnvOrSkipTest(t, "CLOUD_ENV"))
+
+	tmp := t.TempDir()
+	f, err := filer.NewLocalClient(tmp)
+	require.NoError(t, err)
+
+	return f, path.Join(filepath.ToSlash(tmp))
+}
+
+func setupDbfsFiler(t testutil.TestingT) (filer.Filer, string) {
+	_, wt := acc.WorkspaceTest(t)
+
+	tmpdir := acc.TemporaryDbfsDir(wt)
+	f, err := filer.NewDbfsClient(wt.W, tmpdir)
+	require.NoError(t, err)
+	return f, path.Join("dbfs:/", tmpdir)
+}
+
+func setupUcVolumesFiler(t testutil.TestingT) (filer.Filer, string) {
+	_, wt := acc.WorkspaceTest(t)
+
+	if os.Getenv("TEST_METASTORE_ID") == "" {
+		t.Skip("Skipping tests that require a UC Volume when metastore id is not set.")
+	}
+
+	tmpdir := acc.TemporaryVolume(wt)
+	f, err := filer.NewFilesClient(wt.W, tmpdir)
+	require.NoError(t, err)
+
+	return f, path.Join("dbfs:/", tmpdir)
+}
diff --git a/internal/fs_ls_test.go b/integration/cmd/fs/ls_test.go
similarity index 99%
rename from internal/fs_ls_test.go
rename to integration/cmd/fs/ls_test.go
index d56fc8bb00..41d9fc053b 100644
--- a/internal/fs_ls_test.go
+++ b/integration/cmd/fs/ls_test.go
@@ -1,4 +1,4 @@
-package internal
+package fs_test
 
 import (
 	"context"
diff --git a/integration/cmd/fs/main_test.go b/integration/cmd/fs/main_test.go
new file mode 100644
index 0000000000..b9402f0b29
--- /dev/null
+++ b/integration/cmd/fs/main_test.go
@@ -0,0 +1,13 @@
+package fs_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}
diff --git a/internal/fs_mkdir_test.go b/integration/cmd/fs/mkdir_test.go
similarity index 99%
rename from internal/fs_mkdir_test.go
rename to integration/cmd/fs/mkdir_test.go
index 197f5d4b5d..93845a3dd4 100644
--- a/internal/fs_mkdir_test.go
+++ b/integration/cmd/fs/mkdir_test.go
@@ -1,4 +1,4 @@
-package internal
+package fs_test
 
 import (
 	"context"
diff --git a/internal/fs_rm_test.go b/integration/cmd/fs/rm_test.go
similarity index 99%
rename from internal/fs_rm_test.go
rename to integration/cmd/fs/rm_test.go
index 1af779fd27..c3a5349070 100644
--- a/internal/fs_rm_test.go
+++ b/integration/cmd/fs/rm_test.go
@@ -1,4 +1,4 @@
-package internal
+package fs_test
 
 import (
 	"context"
diff --git a/internal/jobs_test.go b/integration/cmd/jobs/jobs_test.go
similarity index 88%
rename from internal/jobs_test.go
rename to integration/cmd/jobs/jobs_test.go
index 2781323e6a..b9dc2976c7 100644
--- a/internal/jobs_test.go
+++ b/integration/cmd/jobs/jobs_test.go
@@ -1,4 +1,4 @@
-package internal
+package jobs_test
 
 import (
 	"encoding/json"
@@ -18,7 +18,7 @@ func TestAccCreateJob(t *testing.T) {
 	if env != "azure" {
 		t.Skipf("Not running test on cloud %s", env)
 	}
-	stdout, stderr := testcli.RequireSuccessfulRun(t, "jobs", "create", "--json", "@testjsons/create_job_without_workers.json", "--log-level=debug")
+	stdout, stderr := testcli.RequireSuccessfulRun(t, "jobs", "create", "--json", "@testdata/create_job_without_workers.json", "--log-level=debug")
 	assert.Empty(t, stderr.String())
 	var output map[string]int
 	err := json.Unmarshal(stdout.Bytes(), &output)
diff --git a/integration/cmd/jobs/main_test.go b/integration/cmd/jobs/main_test.go
new file mode 100644
index 0000000000..46369a5264
--- /dev/null
+++ b/integration/cmd/jobs/main_test.go
@@ -0,0 +1,13 @@
+package jobs_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}
diff --git a/internal/testjsons/create_job_without_workers.json b/integration/cmd/jobs/testdata/create_job_without_workers.json
similarity index 100%
rename from internal/testjsons/create_job_without_workers.json
rename to integration/cmd/jobs/testdata/create_job_without_workers.json
diff --git a/integration/cmd/main_test.go b/integration/cmd/main_test.go
new file mode 100644
index 0000000000..a1a5586b64
--- /dev/null
+++ b/integration/cmd/main_test.go
@@ -0,0 +1,13 @@
+package cmd_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}
diff --git a/integration/cmd/repos/main_test.go b/integration/cmd/repos/main_test.go
new file mode 100644
index 0000000000..7eaa174bce
--- /dev/null
+++ b/integration/cmd/repos/main_test.go
@@ -0,0 +1,13 @@
+package repos_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}
diff --git a/internal/repos_test.go b/integration/cmd/repos/repos_test.go
similarity index 98%
rename from internal/repos_test.go
rename to integration/cmd/repos/repos_test.go
index a89217fe1f..69f7e31148 100644
--- a/internal/repos_test.go
+++ b/integration/cmd/repos/repos_test.go
@@ -1,4 +1,4 @@
-package internal
+package repos_test
 
 import (
 	"context"
@@ -15,6 +15,8 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+const repoUrl = "https://github.com/databricks/databricks-empty-ide-project.git"
+
 func synthesizeTemporaryRepoPath(t *testing.T, w *databricks.WorkspaceClient, ctx context.Context) string {
 	me, err := w.CurrentUser.Me(ctx)
 	require.NoError(t, err)
diff --git a/integration/cmd/secrets/main_test.go b/integration/cmd/secrets/main_test.go
new file mode 100644
index 0000000000..a44d306711
--- /dev/null
+++ b/integration/cmd/secrets/main_test.go
@@ -0,0 +1,13 @@
+package secrets_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}
diff --git a/internal/secrets_test.go b/integration/cmd/secrets/secrets_test.go
similarity index 99%
rename from internal/secrets_test.go
rename to integration/cmd/secrets/secrets_test.go
index 0ad9cece71..8f06699d76 100644
--- a/internal/secrets_test.go
+++ b/integration/cmd/secrets/secrets_test.go
@@ -1,4 +1,4 @@
-package internal
+package secrets_test
 
 import (
 	"context"
diff --git a/integration/cmd/storage_credentials/main_test.go b/integration/cmd/storage_credentials/main_test.go
new file mode 100644
index 0000000000..14d00d9660
--- /dev/null
+++ b/integration/cmd/storage_credentials/main_test.go
@@ -0,0 +1,13 @@
+package storage_credentials_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}
diff --git a/internal/storage_credentials_test.go b/integration/cmd/storage_credentials/storage_credentials_test.go
similarity index 94%
rename from internal/storage_credentials_test.go
rename to integration/cmd/storage_credentials/storage_credentials_test.go
index b7fe1aa56a..41f21f224d 100644
--- a/internal/storage_credentials_test.go
+++ b/integration/cmd/storage_credentials/storage_credentials_test.go
@@ -1,4 +1,4 @@
-package internal
+package storage_credentials_test
 
 import (
 	"testing"
diff --git a/integration/cmd/sync/main_test.go b/integration/cmd/sync/main_test.go
new file mode 100644
index 0000000000..8d9f3ca252
--- /dev/null
+++ b/integration/cmd/sync/main_test.go
@@ -0,0 +1,13 @@
+package sync_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}
diff --git a/internal/sync_test.go b/integration/cmd/sync/sync_test.go
similarity index 99%
rename from internal/sync_test.go
rename to integration/cmd/sync/sync_test.go
index 9fff6055b3..82124cc953 100644
--- a/internal/sync_test.go
+++ b/integration/cmd/sync/sync_test.go
@@ -1,4 +1,4 @@
-package internal
+package sync_test
 
 import (
 	"context"
diff --git a/internal/unknown_command_test.go b/integration/cmd/unknown_command_test.go
similarity index 96%
rename from internal/unknown_command_test.go
rename to integration/cmd/unknown_command_test.go
index 96cb4fa5e8..e18493940c 100644
--- a/internal/unknown_command_test.go
+++ b/integration/cmd/unknown_command_test.go
@@ -1,4 +1,4 @@
-package internal
+package cmd_test
 
 import (
 	"testing"
diff --git a/integration/cmd/version/main_test.go b/integration/cmd/version/main_test.go
new file mode 100644
index 0000000000..4aa5e046ac
--- /dev/null
+++ b/integration/cmd/version/main_test.go
@@ -0,0 +1,13 @@
+package version_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}
diff --git a/internal/version_test.go b/integration/cmd/version/version_test.go
similarity index 98%
rename from internal/version_test.go
rename to integration/cmd/version/version_test.go
index 5c5c3a1005..ab00e7242f 100644
--- a/internal/version_test.go
+++ b/integration/cmd/version/version_test.go
@@ -1,4 +1,4 @@
-package internal
+package version_test
 
 import (
 	"encoding/json"
diff --git a/integration/cmd/workspace/main_test.go b/integration/cmd/workspace/main_test.go
new file mode 100644
index 0000000000..40d140eac9
--- /dev/null
+++ b/integration/cmd/workspace/main_test.go
@@ -0,0 +1,13 @@
+package workspace_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}
diff --git a/internal/testdata/import_dir/a/b/c/file-b b/integration/cmd/workspace/testdata/import_dir/a/b/c/file-b
similarity index 100%
rename from internal/testdata/import_dir/a/b/c/file-b
rename to integration/cmd/workspace/testdata/import_dir/a/b/c/file-b
diff --git a/internal/testdata/import_dir/file-a b/integration/cmd/workspace/testdata/import_dir/file-a
similarity index 100%
rename from internal/testdata/import_dir/file-a
rename to integration/cmd/workspace/testdata/import_dir/file-a
diff --git a/internal/testdata/import_dir/jupyterNotebook.ipynb b/integration/cmd/workspace/testdata/import_dir/jupyterNotebook.ipynb
similarity index 100%
rename from internal/testdata/import_dir/jupyterNotebook.ipynb
rename to integration/cmd/workspace/testdata/import_dir/jupyterNotebook.ipynb
diff --git a/internal/testdata/import_dir/pyNotebook.py b/integration/cmd/workspace/testdata/import_dir/pyNotebook.py
similarity index 100%
rename from internal/testdata/import_dir/pyNotebook.py
rename to integration/cmd/workspace/testdata/import_dir/pyNotebook.py
diff --git a/internal/testdata/import_dir/rNotebook.r b/integration/cmd/workspace/testdata/import_dir/rNotebook.r
similarity index 100%
rename from internal/testdata/import_dir/rNotebook.r
rename to integration/cmd/workspace/testdata/import_dir/rNotebook.r
diff --git a/internal/testdata/import_dir/scalaNotebook.scala b/integration/cmd/workspace/testdata/import_dir/scalaNotebook.scala
similarity index 100%
rename from internal/testdata/import_dir/scalaNotebook.scala
rename to integration/cmd/workspace/testdata/import_dir/scalaNotebook.scala
diff --git a/internal/testdata/import_dir/sqlNotebook.sql b/integration/cmd/workspace/testdata/import_dir/sqlNotebook.sql
similarity index 100%
rename from internal/testdata/import_dir/sqlNotebook.sql
rename to integration/cmd/workspace/testdata/import_dir/sqlNotebook.sql
diff --git a/internal/workspace_test.go b/integration/cmd/workspace/workspace_test.go
similarity index 99%
rename from internal/workspace_test.go
rename to integration/cmd/workspace/workspace_test.go
index f16245aa29..28405a09b1 100644
--- a/internal/workspace_test.go
+++ b/integration/cmd/workspace/workspace_test.go
@@ -1,4 +1,4 @@
-package internal
+package workspace_test
 
 import (
 	"context"
diff --git a/integration/enforce_convention_test.go b/integration/enforce_convention_test.go
new file mode 100644
index 0000000000..cc822a6a37
--- /dev/null
+++ b/integration/enforce_convention_test.go
@@ -0,0 +1,116 @@
+package integration
+
+import (
+	"go/parser"
+	"go/token"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+	"text/template"
+
+	"golang.org/x/exp/maps"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+type packageInfo struct {
+	Name  string
+	Files []string
+}
+
+func enumeratePackages(t *testing.T) map[string]packageInfo {
+	pkgmap := make(map[string]packageInfo)
+	err := filepath.Walk(".", func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		// Skip files.
+		if !info.IsDir() {
+			return nil
+		}
+
+		// Skip the root directory and the "internal" directory.
+		if path == "." || strings.HasPrefix(path, "internal") {
+			return nil
+		}
+
+		fset := token.NewFileSet()
+		pkgs, err := parser.ParseDir(fset, path, nil, parser.ParseComments)
+		require.NoError(t, err)
+		if len(pkgs) == 0 {
+			return nil
+		}
+
+		// Expect one package per directory.
+		require.Len(t, pkgs, 1, "Directory %s contains more than one package", path)
+		v := maps.Values(pkgs)[0]
+
+		// Record the package.
+		pkgmap[path] = packageInfo{
+			Name:  v.Name,
+			Files: maps.Keys(v.Files),
+		}
+		return nil
+	})
+	require.NoError(t, err)
+	return pkgmap
+}
+
+// TestEnforcePackageNames checks that all integration test package names use the "_test" suffix.
+// We enforce this package name to avoid package name aliasing.
+func TestEnforcePackageNames(t *testing.T) {
+	pkgmap := enumeratePackages(t)
+	for _, pkg := range pkgmap {
+		assert.True(t, strings.HasSuffix(pkg.Name, "_test"), "Package name %s does not end with _test", pkg.Name)
+	}
+}
+
+var mainTestTemplate = template.Must(template.New("main_test").Parse(
+	`package {{.Name}}
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}
+`))
+
+func TestEnforceMainTest(t *testing.T) {
+	pkgmap := enumeratePackages(t)
+	for dir, pkg := range pkgmap {
+		found := false
+		for _, file := range pkg.Files {
+			if filepath.Base(file) == "main_test.go" {
+				found = true
+				break
+			}
+		}
+
+		// Expect a "main_test.go" file in each package.
+		assert.True(t, found, "Directory %s does not contain a main_test.go file", dir)
+	}
+}
+
+func TestWriteMainTest(t *testing.T) {
+	t.Skip("Uncomment to write main_test.go files")
+
+	pkgmap := enumeratePackages(t)
+	for dir, pkg := range pkgmap {
+		// Write a "main_test.go" file to the package.
+		// This file is required to run the integration tests.
+		f, err := os.Create(filepath.Join(dir, "main_test.go"))
+		require.NoError(t, err)
+		defer f.Close()
+		err = mainTestTemplate.Execute(f, pkg)
+		require.NoError(t, err)
+	}
+}
diff --git a/integration/internal/main.go b/integration/internal/main.go
new file mode 100644
index 0000000000..6d69dcf70e
--- /dev/null
+++ b/integration/internal/main.go
@@ -0,0 +1,20 @@
+package internal
+
+import (
+	"fmt"
+	"os"
+	"testing"
+)
+
+// Main is the entry point for integration tests.
+// We use this for all integration tests defined in this subtree to ensure
+// they are not inadvertently executed when calling `go test ./...`.
+func Main(m *testing.M) {
+	value := os.Getenv("CLOUD_ENV")
+	if value == "" {
+		fmt.Println("CLOUD_ENV is not set, skipping integration tests")
+		return
+	}
+
+	m.Run()
+}
diff --git a/internal/filer_test.go b/integration/libs/filer/filer_test.go
similarity index 99%
rename from internal/filer_test.go
rename to integration/libs/filer/filer_test.go
index 4b7a0b53eb..a4cfa9db3f 100644
--- a/internal/filer_test.go
+++ b/integration/libs/filer/filer_test.go
@@ -1,4 +1,4 @@
-package internal
+package filer_test
 
 import (
 	"bytes"
diff --git a/internal/helpers.go b/integration/libs/filer/helpers_test.go
similarity index 99%
rename from internal/helpers.go
rename to integration/libs/filer/helpers_test.go
index d57e9b9c2c..49031b3922 100644
--- a/internal/helpers.go
+++ b/integration/libs/filer/helpers_test.go
@@ -1,4 +1,4 @@
-package internal
+package filer_test
 
 import (
 	"errors"
diff --git a/integration/libs/filer/main_test.go b/integration/libs/filer/main_test.go
new file mode 100644
index 0000000000..ca866d9526
--- /dev/null
+++ b/integration/libs/filer/main_test.go
@@ -0,0 +1,13 @@
+package filer_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}
diff --git a/internal/testdata/notebooks/py1.ipynb b/integration/libs/filer/testdata/notebooks/py1.ipynb
similarity index 100%
rename from internal/testdata/notebooks/py1.ipynb
rename to integration/libs/filer/testdata/notebooks/py1.ipynb
diff --git a/internal/testdata/notebooks/py2.ipynb b/integration/libs/filer/testdata/notebooks/py2.ipynb
similarity index 100%
rename from internal/testdata/notebooks/py2.ipynb
rename to integration/libs/filer/testdata/notebooks/py2.ipynb
diff --git a/internal/testdata/notebooks/r1.ipynb b/integration/libs/filer/testdata/notebooks/r1.ipynb
similarity index 100%
rename from internal/testdata/notebooks/r1.ipynb
rename to integration/libs/filer/testdata/notebooks/r1.ipynb
diff --git a/internal/testdata/notebooks/r2.ipynb b/integration/libs/filer/testdata/notebooks/r2.ipynb
similarity index 100%
rename from internal/testdata/notebooks/r2.ipynb
rename to integration/libs/filer/testdata/notebooks/r2.ipynb
diff --git a/internal/testdata/notebooks/scala1.ipynb b/integration/libs/filer/testdata/notebooks/scala1.ipynb
similarity index 100%
rename from internal/testdata/notebooks/scala1.ipynb
rename to integration/libs/filer/testdata/notebooks/scala1.ipynb
diff --git a/internal/testdata/notebooks/scala2.ipynb b/integration/libs/filer/testdata/notebooks/scala2.ipynb
similarity index 100%
rename from internal/testdata/notebooks/scala2.ipynb
rename to integration/libs/filer/testdata/notebooks/scala2.ipynb
diff --git a/internal/testdata/notebooks/sql1.ipynb b/integration/libs/filer/testdata/notebooks/sql1.ipynb
similarity index 100%
rename from internal/testdata/notebooks/sql1.ipynb
rename to integration/libs/filer/testdata/notebooks/sql1.ipynb
diff --git a/internal/testdata/notebooks/sql2.ipynb b/integration/libs/filer/testdata/notebooks/sql2.ipynb
similarity index 100%
rename from internal/testdata/notebooks/sql2.ipynb
rename to integration/libs/filer/testdata/notebooks/sql2.ipynb
diff --git a/internal/git_clone_test.go b/integration/libs/git/git_clone_test.go
similarity index 99%
rename from internal/git_clone_test.go
rename to integration/libs/git/git_clone_test.go
index d5e6762dde..53cfe6fb98 100644
--- a/internal/git_clone_test.go
+++ b/integration/libs/git/git_clone_test.go
@@ -1,4 +1,4 @@
-package internal
+package git_test
 
 import (
 	"context"
diff --git a/internal/git_fetch_test.go b/integration/libs/git/git_fetch_test.go
similarity index 99%
rename from internal/git_fetch_test.go
rename to integration/libs/git/git_fetch_test.go
index e692970c77..849770c3b8 100644
--- a/internal/git_fetch_test.go
+++ b/integration/libs/git/git_fetch_test.go
@@ -1,4 +1,4 @@
-package internal
+package git_test
 
 import (
 	"os"
diff --git a/integration/libs/git/main_test.go b/integration/libs/git/main_test.go
new file mode 100644
index 0000000000..5d68e08512
--- /dev/null
+++ b/integration/libs/git/main_test.go
@@ -0,0 +1,13 @@
+package git_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}
diff --git a/internal/locker_test.go b/integration/libs/locker/locker_test.go
similarity index 99%
rename from internal/locker_test.go
rename to integration/libs/locker/locker_test.go
index 87f74e9d85..fcc4b346a9 100644
--- a/internal/locker_test.go
+++ b/integration/libs/locker/locker_test.go
@@ -1,4 +1,4 @@
-package internal
+package locker_test
 
 import (
 	"context"
diff --git a/integration/libs/locker/main_test.go b/integration/libs/locker/main_test.go
new file mode 100644
index 0000000000..33a883768d
--- /dev/null
+++ b/integration/libs/locker/main_test.go
@@ -0,0 +1,13 @@
+package locker_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}
diff --git a/integration/libs/tags/main_test.go b/integration/libs/tags/main_test.go
new file mode 100644
index 0000000000..4eaf54a20f
--- /dev/null
+++ b/integration/libs/tags/main_test.go
@@ -0,0 +1,13 @@
+package tags_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}
diff --git a/internal/tags_test.go b/integration/libs/tags/tags_test.go
similarity index 99%
rename from internal/tags_test.go
rename to integration/libs/tags/tags_test.go
index ea2c0db052..2abec29a52 100644
--- a/internal/tags_test.go
+++ b/integration/libs/tags/tags_test.go
@@ -1,4 +1,4 @@
-package internal
+package tags_test
 
 import (
 	"strings"
diff --git a/integration/python/main_test.go b/integration/python/main_test.go
new file mode 100644
index 0000000000..b35da21e1d
--- /dev/null
+++ b/integration/python/main_test.go
@@ -0,0 +1,13 @@
+package python_test
+
+import (
+	"testing"
+
+	"github.com/databricks/cli/integration/internal"
+)
+
+// TestMain is the entrypoint executed by the test runner.
+// See [internal.Main] for prerequisites for running integration tests.
+func TestMain(m *testing.M) {
+	internal.Main(m)
+}
diff --git a/internal/python/python_tasks_test.go b/integration/python/python_tasks_test.go
similarity index 99%
rename from internal/python/python_tasks_test.go
rename to integration/python/python_tasks_test.go
index 36efa4a1b8..18191291ce 100644
--- a/internal/python/python_tasks_test.go
+++ b/integration/python/python_tasks_test.go
@@ -1,4 +1,4 @@
-package python
+package python_test
 
 import (
 	"bytes"
diff --git a/internal/python/testdata/my_test_code-0.0.1-py3-none-any.whl b/integration/python/testdata/my_test_code-0.0.1-py3-none-any.whl
similarity index 100%
rename from internal/python/testdata/my_test_code-0.0.1-py3-none-any.whl
rename to integration/python/testdata/my_test_code-0.0.1-py3-none-any.whl
diff --git a/internal/python/testdata/spark.py b/integration/python/testdata/spark.py
similarity index 100%
rename from internal/python/testdata/spark.py
rename to integration/python/testdata/spark.py
diff --git a/internal/python/testdata/test.py b/integration/python/testdata/test.py
similarity index 100%
rename from internal/python/testdata/test.py
rename to integration/python/testdata/test.py