diff --git a/addons/api/package.json b/addons/api/package.json
index 85cf8e9d5..8dda6120a 100644
--- a/addons/api/package.json
+++ b/addons/api/package.json
@@ -48,7 +48,7 @@
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^8.0.1",
     "doctoc": "^2.2.0",
-    "ember-cli": "^4.12.1",
+    "ember-cli": "^4.12.2",
     "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
@@ -56,7 +56,7 @@
     "ember-exam": "^8.0.0",
     "ember-load-initializers": "^2.1.2",
     "ember-page-title": "^7.0.0",
-    "ember-qunit": "^6.2.0",
+    "ember-qunit": "^8.1.0",
     "ember-resolver": "^10.0.0",
     "ember-source": "~4.12.0",
     "ember-source-channel-url": "^3.0.0",
diff --git a/addons/auth/package.json b/addons/auth/package.json
index 6add3e4ad..19bfdbccd 100644
--- a/addons/auth/package.json
+++ b/addons/auth/package.json
@@ -49,7 +49,7 @@
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.2",
     "ember-page-title": "^7.0.0",
-    "ember-qunit": "^6.2.0",
+    "ember-qunit": "^8.1.0",
     "ember-resolver": "^10.0.0",
     "ember-source": "~4.12.0",
     "ember-source-channel-url": "^3.0.0",
diff --git a/addons/core/package.json b/addons/core/package.json
index 391382ab9..3fcaaba10 100644
--- a/addons/core/package.json
+++ b/addons/core/package.json
@@ -67,7 +67,7 @@
     "ember-inline-svg": "^1.0.1",
     "ember-load-initializers": "^2.1.2",
     "ember-page-title": "^7.0.0",
-    "ember-qunit": "^6.2.0",
+    "ember-qunit": "^8.1.0",
     "ember-resolver": "^10.0.0",
     "ember-source": "~4.12.0",
     "ember-source-channel-url": "^3.0.0",
diff --git a/addons/rose/package.json b/addons/rose/package.json
index 36eb55988..684535844 100644
--- a/addons/rose/package.json
+++ b/addons/rose/package.json
@@ -73,7 +73,7 @@
     "ember-maybe-import-regenerator": "^1.0.0",
     "ember-modifier": "^3.2.7",
     "ember-page-title": "^7.0.0",
-    "ember-qunit": "^6.2.0",
+    "ember-qunit": "^8.1.0",
     "ember-resolver": "^10.0.0",
     "ember-source": "~4.12.0",
     "ember-source-channel-url": "^3.0.0",
diff --git a/ui/admin/package.json b/ui/admin/package.json
index ff74a1674..b5311171d 100644
--- a/ui/admin/package.json
+++ b/ui/admin/package.json
@@ -86,7 +86,7 @@
     "ember-modifier": "^4.1.0",
     "ember-page-title": "^7.0.0",
     "ember-pollster": "https://github.com/hashicorp/ember-pollster.git#718db797382b04aca281216319885c5ff625f539",
-    "ember-qunit": "^6.2.0",
+    "ember-qunit": "^8.1.0",
     "ember-resolver": "^10.0.0",
     "ember-source": "~4.12.0",
     "ember-template-lint": "^5.7.2",
diff --git a/ui/desktop/package.json b/ui/desktop/package.json
index 88b3c4abb..c28171db7 100644
--- a/ui/desktop/package.json
+++ b/ui/desktop/package.json
@@ -91,7 +91,7 @@
     "ember-modifier": "^4.1.0",
     "ember-page-title": "^7.0.0",
     "ember-pollster": "https://github.com/hashicorp/ember-pollster.git#718db797382b04aca281216319885c5ff625f539",
-    "ember-qunit": "^6.2.0",
+    "ember-qunit": "^8.1.0",
     "ember-resolver": "^10.0.0",
     "ember-source": "~4.12.0",
     "ember-template-lint": "^5.7.2",
diff --git a/yarn.lock b/yarn.lock
index c04301949..3e074bcec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10227,7 +10227,7 @@ ember-auto-import@^1.11.2:
     walk-sync "^0.3.3"
     webpack "^4.43.0"
 
-ember-auto-import@^2.2.3, ember-auto-import@^2.4.1, ember-auto-import@^2.4.2, ember-auto-import@^2.5.0, ember-auto-import@^2.6.0, ember-auto-import@^2.6.1, ember-auto-import@^2.6.3:
+ember-auto-import@^2.2.3, ember-auto-import@^2.4.1, ember-auto-import@^2.4.2, ember-auto-import@^2.5.0, ember-auto-import@^2.6.1, ember-auto-import@^2.6.3:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.6.3.tgz#f18d1b93dd10b08ba5496518436f9d56dd4e000a"
   integrity sha512-uLhrRDJYWCRvQ4JQ1e64XlSrqAKSd6PXaJ9ZsZI6Tlms9T4DtQFxNXasqji2ZRJBVrxEoLCRYX3RTldsQ0vNGQ==
@@ -10324,7 +10324,7 @@ ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.0, em
   resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
   integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
 
-ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.10.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.19.0, ember-cli-babel@^7.20.5, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.10, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.5, ember-cli-babel@^7.26.6, ember-cli-babel@^7.26.8, ember-cli-babel@^7.7.3:
+ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.10.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.13.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.20.5, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.10, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.5, ember-cli-babel@^7.26.6, ember-cli-babel@^7.26.8, ember-cli-babel@^7.7.3:
   version "7.26.11"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f"
   integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==
@@ -10674,12 +10674,12 @@ ember-cli-test-info@^1.0.0:
   dependencies:
     ember-cli-string-utils "^1.0.0"
 
-ember-cli-test-loader@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-test-loader/-/ember-cli-test-loader-3.0.0.tgz#1c036fc48de36155355fcda3266af63f977826f1"
-  integrity sha512-wfFRBrfO9gaKScYcdQxTfklx9yp1lWK6zv1rZRpkas9z2SHyJojF7NOQRWQgSB3ypm7vfpiF8VsFFVVr7VBzAQ==
+ember-cli-test-loader@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-test-loader/-/ember-cli-test-loader-3.1.0.tgz#13abd43b7e07e2266a9f0fc5b9dc5455883b18ff"
+  integrity sha512-0aocZV9SIoOHiU3hrH3IuLR6busWhTX6UVXgd490hmJkIymmOXNH2+jJoC7Ebkeo3PiOfAdjqhb765QDlHSJOw==
   dependencies:
-    ember-cli-babel "^7.13.2"
+    ember-cli-babel "^7.23.0"
 
 ember-cli-typescript-blueprint-polyfill@^0.1.0:
   version "0.1.0"
@@ -10826,105 +10826,6 @@ ember-cli-version-checker@^5.0.2, ember-cli-version-checker@^5.1.1, ember-cli-ve
     semver "^7.3.4"
     silent-error "^1.1.1"
 
-ember-cli@^4.12.1:
-  version "4.12.1"
-  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-4.12.1.tgz#fae100f68a5ab759b6f6da4b29c6a0aa74cf829d"
-  integrity sha512-O4QqvbvyyAvIC5SlYNOOocEhX/co7wKOSEGf8M+ipU/zgzA5ElyKMAQly9wf1QJ/RbSD1j2cFVUBIdVH/OuJHg==
-  dependencies:
-    "@babel/core" "^7.21.0"
-    "@babel/plugin-transform-modules-amd" "^7.20.11"
-    amd-name-resolver "^1.3.1"
-    babel-plugin-module-resolver "^4.1.0"
-    bower-config "^1.4.3"
-    bower-endpoint-parser "0.2.2"
-    broccoli "^3.5.2"
-    broccoli-amd-funnel "^2.0.1"
-    broccoli-babel-transpiler "^7.8.1"
-    broccoli-builder "^0.18.14"
-    broccoli-concat "^4.2.5"
-    broccoli-config-loader "^1.0.1"
-    broccoli-config-replace "^1.1.2"
-    broccoli-debug "^0.6.5"
-    broccoli-funnel "^3.0.8"
-    broccoli-funnel-reducer "^1.0.0"
-    broccoli-merge-trees "^4.2.0"
-    broccoli-middleware "^2.1.1"
-    broccoli-slow-trees "^3.1.0"
-    broccoli-source "^3.0.1"
-    broccoli-stew "^3.0.0"
-    calculate-cache-key-for-tree "^2.0.0"
-    capture-exit "^2.0.0"
-    chalk "^4.1.2"
-    ci-info "^3.7.0"
-    clean-base-url "^1.0.0"
-    compression "^1.7.4"
-    configstore "^5.0.1"
-    console-ui "^3.1.2"
-    core-object "^3.1.5"
-    dag-map "^2.0.2"
-    diff "^5.1.0"
-    ember-cli-is-package-missing "^1.0.0"
-    ember-cli-lodash-subset "^2.0.1"
-    ember-cli-normalize-entity-name "^1.0.0"
-    ember-cli-preprocess-registry "^3.3.0"
-    ember-cli-string-utils "^1.1.0"
-    ensure-posix-path "^1.1.1"
-    execa "^5.1.1"
-    exit "^0.1.2"
-    express "^4.18.1"
-    filesize "^10.0.5"
-    find-up "^5.0.0"
-    find-yarn-workspace-root "^2.0.0"
-    fixturify-project "^2.1.1"
-    fs-extra "^11.1.0"
-    fs-tree-diff "^2.0.1"
-    get-caller-file "^2.0.5"
-    git-repo-info "^2.1.1"
-    glob "^8.1.0"
-    heimdalljs "^0.2.6"
-    heimdalljs-fs-monitor "^1.1.1"
-    heimdalljs-graph "^1.0.0"
-    heimdalljs-logger "^0.1.10"
-    http-proxy "^1.18.1"
-    inflection "^2.0.1"
-    inquirer "^8.2.1"
-    is-git-url "^1.0.0"
-    is-language-code "^3.1.0"
-    isbinaryfile "^5.0.0"
-    js-yaml "^4.1.0"
-    leek "0.0.24"
-    lodash.template "^4.5.0"
-    markdown-it "^13.0.1"
-    markdown-it-terminal "^0.4.0"
-    minimatch "^7.4.1"
-    morgan "^1.10.0"
-    nopt "^3.0.6"
-    npm-package-arg "^10.1.0"
-    os-locale "^5.0.0"
-    p-defer "^3.0.0"
-    portfinder "^1.0.32"
-    promise-map-series "^0.3.0"
-    promise.hash.helper "^1.0.8"
-    quick-temp "^0.1.8"
-    remove-types "^1.0.0"
-    resolve "^1.22.1"
-    resolve-package-path "^4.0.3"
-    safe-stable-stringify "^2.4.2"
-    sane "^5.0.1"
-    semver "^7.3.5"
-    silent-error "^1.1.1"
-    sort-package-json "^1.57.0"
-    symlink-or-copy "^1.3.1"
-    temp "0.9.4"
-    testem "^3.10.1"
-    tiny-lr "^2.0.0"
-    tree-sync "^2.1.0"
-    uuid "^9.0.0"
-    walk-sync "^3.0.0"
-    watch-detector "^1.0.2"
-    workerpool "^6.4.0"
-    yam "^1.0.0"
-
 ember-cli@^4.12.2:
   version "4.12.2"
   resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-4.12.2.tgz#a9d2dd191093fcf18122732fae8999c9ca873447"
@@ -11422,20 +11323,15 @@ ember-power-select@^8.2.0:
     ember-modifier "^4.1.0"
     ember-truth-helpers "^4.0.3"
 
-ember-qunit@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-6.2.0.tgz#4d492951035d1df5c7802c4ae6cf299c8f41d75b"
-  integrity sha512-mC+0bp8DwWzJLn8SW3GS8KDZIkl4yLsNYwMi5Dw6+aFllq7FM2crd/dfY4MuOIHK7GKdjtmWJTMGnjSpeSayaw==
+ember-qunit@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-8.1.0.tgz#c9dcd5bc97d3b122db7e416e3aef09fba7db39f9"
+  integrity sha512-55/xqvVQwhiNcnh/tCzWyvlYzrYqwDY0/cIPyDQbAxGKtkUt9jCfRUGllfyOofC6LX0fL/0fIi+5e9sg1m6vXw==
   dependencies:
-    broccoli-funnel "^3.0.8"
-    broccoli-merge-trees "^3.0.2"
-    common-tags "^1.8.0"
-    ember-auto-import "^2.6.0"
-    ember-cli-babel "^7.26.11"
-    ember-cli-test-loader "^3.0.0"
-    resolve-package-path "^4.0.3"
-    silent-error "^1.1.1"
-    validate-peer-dependencies "^2.2.0"
+    "@embroider/addon-shim" "^1.8.6"
+    "@embroider/macros" "^1.13.1"
+    ember-cli-test-loader "^3.1.0"
+    qunit-theme-ember "^1.0.0"
 
 "ember-radio-button@github:yapplabs/ember-radio-button.git#b2ab65f":
   version "0.0.0"
@@ -18305,6 +18201,11 @@ qunit-dom@^2.0.0:
     ember-cli-babel "^7.23.0"
     ember-cli-version-checker "^5.1.1"
 
+qunit-theme-ember@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/qunit-theme-ember/-/qunit-theme-ember-1.0.0.tgz#3b750b9e3ab2837cc3b31cc5b73a0b71b964b0db"
+  integrity sha512-vdMVVo6ecdCkWttMTKeyq1ZTLGHcA6zdze2zhguNuc3ritlJMhOXY5RDseqazOwqZVfCg3rtlmL3fMUyIzUyFQ==
+
 qunit@^2.19.4:
   version "2.19.4"
   resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.19.4.tgz#2d689bb1165edd4b812e3ed2ee06ff907e9f2ece"
@@ -21426,14 +21327,6 @@ validate-peer-dependencies@^2.0.0:
     resolve-package-path "^4.0.0"
     semver "^7.3.2"
 
-validate-peer-dependencies@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/validate-peer-dependencies/-/validate-peer-dependencies-2.2.0.tgz#47b8ff008f66a66fc5d8699123844522c1d874f4"
-  integrity sha512-8X1OWlERjiUY6P6tdeU9E0EwO8RA3bahoOVG7ulOZT5MqgNDUO/BQoVjYiHPcNe+v8glsboZRIw9iToMAA2zAA==
-  dependencies:
-    resolve-package-path "^4.0.3"
-    semver "^7.3.8"
-
 vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"