diff --git a/acceptance/bundle/templates/default-python-errorserverless/input.json b/acceptance/bundle/templates/default-python-errorserverless/input.json
deleted file mode 100644
index 3e1d79c68..000000000
--- a/acceptance/bundle/templates/default-python-errorserverless/input.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "project_name": "my_default_python",
-    "include_notebook": "yes",
-    "include_dlt": "yes",
-    "include_python": "yes"
-}
diff --git a/acceptance/bundle/templates/default-python-errorserverless/out.compare-vs-serverless.diff b/acceptance/bundle/templates/default-python-errorserverless/out.compare-vs-serverless.diff
deleted file mode 100644
index 8781e0986..000000000
--- a/acceptance/bundle/templates/default-python-errorserverless/out.compare-vs-serverless.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- [TESTROOT]/bundle/templates/default-python-errorserverless/../default-python/output/my_default_python/resources/my_default_python.job.yml
-+++ output/my_default_python/resources/my_default_python.job.yml
-@@ -17,4 +17,5 @@
-       tasks:
-         - task_key: notebook_task
-+          job_cluster_key: job_cluster
-           notebook_task:
-             notebook_path: ../src/notebook.ipynb
-@@ -29,16 +30,19 @@
-           depends_on:
-             - task_key: refresh_pipeline
--          environment_key: default
-+          job_cluster_key: job_cluster
-           python_wheel_task:
-             package_name: my_default_python
-             entry_point: main
--      # A list of task execution environment specifications that can be referenced by tasks of this job.
--      environments:
--        - environment_key: default
--
--          # Full documentation of this spec can be found at:
--          # https://docs.databricks.com/api/workspace/jobs/create#environments-spec
--          spec:
--            client: "1"
--            dependencies:
--              - ../dist/*.whl
-+          libraries:
-+            # By default we just include the .whl file generated for the my_default_python package.
-+            # See https://docs.databricks.com/dev-tools/bundles/library-dependencies.html
-+            # for more information on how to add other libraries.
-+            - whl: ../dist/*.whl
-+      job_clusters:
-+        - job_cluster_key: job_cluster
-+          new_cluster:
-+            spark_version: 15.4.x-scala2.12
-+            node_type_id: i3.xlarge
-+            autoscale:
-+                min_workers: 1
-+                max_workers: 4
diff --git a/acceptance/bundle/templates/default-python-errorserverless/output.txt b/acceptance/bundle/templates/default-python-errorserverless/output.txt
deleted file mode 100644
index f6de70e6a..000000000
--- a/acceptance/bundle/templates/default-python-errorserverless/output.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-
->>> [CLI] bundle init default-python --config-file ./input.json --output-dir output
-
-Welcome to the default Python template for Databricks Asset Bundles!
-Warn: Failed to detect if serverless is supported: /api/2.0/settings-api/workspace/900800700600/serverless_job_nb failed: Internal Server Error
-Workspace to use (auto-detected, edit in 'my_default_python/databricks.yml'): [DATABRICKS_URL]
-
-✨ Your new project has been created in the 'my_default_python' directory!
-
-Please refer to the README.md file for "getting started" instructions.
-See also the documentation at https://docs.databricks.com/dev-tools/bundles/index.html.
-
->>> [CLI] bundle validate -t dev
-Name: my_default_python
-Target: dev
-Workspace:
-  Host: [DATABRICKS_URL]
-  User: [USERNAME]
-  Path: /Workspace/Users/[USERNAME]/.bundle/my_default_python/dev
-
-Validation OK!
-
->>> [CLI] bundle validate -t prod
-Name: my_default_python
-Target: prod
-Workspace:
-  Host: [DATABRICKS_URL]
-  User: [USERNAME]
-  Path: /Workspace/Users/[USERNAME]/.bundle/my_default_python/prod
-
-Validation OK!
diff --git a/acceptance/bundle/templates/default-python-errorserverless/script b/acceptance/bundle/templates/default-python-errorserverless/script
deleted file mode 100644
index 655c5bcb7..000000000
--- a/acceptance/bundle/templates/default-python-errorserverless/script
+++ /dev/null
@@ -1,15 +0,0 @@
-trace $CLI bundle init default-python --config-file ./input.json --output-dir output
-
-cd output/my_default_python
-trace $CLI bundle validate -t dev
-trace $CLI bundle validate -t prod
-
-# Do not affect this repository's git behaviour #2318
-mv .gitignore out.gitignore
-
-cd ../../
-
-# Calculate the difference from the standard (serverless) template
-diff.py $TESTDIR/../default-python/output output/ > out.compare-vs-serverless.diff
-
-rm -fr output
diff --git a/acceptance/bundle/templates/default-python-errorserverless/test.toml b/acceptance/bundle/templates/default-python-errorserverless/test.toml
deleted file mode 100644
index f28682b5b..000000000
--- a/acceptance/bundle/templates/default-python-errorserverless/test.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[Server]]
-Pattern = "GET /api/2.0/settings-api/workspace/{workspaceId}/serverless_job_nb"
-Response.StatusCode = 500