diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e2ac3ce..1a804f4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -82,8 +82,13 @@ jobs:
 
       - name: Obtain all dev dependencies for LocalGov Drupal
         run: |
+          # Installing all localgov dev dependencies doesn't work due to issues with drupal.org packaging.
+          # jq --raw-output '.packages[] | select(.name | startswith("drupal/localgov*")) | ."require-dev" | values | to_entries[] | @sh "\(.key):\(.value)"' ./html/composer.lock | sort | uniq | xargs composer --working-dir=./html require --dev --no-interaction
+          # Instead just install the dependencies needed for the tests.
           composer --working-dir=./html require 'drupal/facets:^2.0'
-          jq --raw-output '.packages[] | select(.name | startswith("localgovdrupal/")) | ."require-dev" | values | to_entries[] | @sh "\(.key):\(.value)"' ./html/composer.lock | sort | uniq | xargs composer --working-dir=./html require --dev --no-interaction
+          composer --working-dir=./html require 'drupal/facets_form:^1.3'
+          composer --working-dir=./html require 'drupal/group:^3.2'
+          
 
   phpcs:
     name: Coding standards checks
diff --git a/composer.json b/composer.json
index 80953bd..00d7b01 100644
--- a/composer.json
+++ b/composer.json
@@ -15,8 +15,8 @@
         "cweagans/composer-patches": "^1.6",
         "drupal/core-composer-scaffold": "^10.3",
         "drupal/core-recommended": "^10.3",
-        "localgovdrupal/localgov": "^3.0",
-        "localgovdrupal/localgov_search_solr": "^1.1",
+        "drupal/localgov": "^3.0",
+        "drupal/localgov_search_solr": "^1.1",
         "wikimedia/composer-merge-plugin": "^2.1"
     },
     "require-dev": {
@@ -74,12 +74,12 @@
             }
         },
         "patches-ignore": {
-            "localgovdrupal/localgov": {
+            "drupal/localgov": {
                 "drupal/core": {
                     "Content moderation and Workspaces https://www.drupal.org/project/drupal/issues/3179199#comment-15711680" : "https://www.drupal.org/files/issues/2024-08-11/3179199-3132022-content-moderation-workspaces-query.patch"
                 }
             },
-            "localgovdrupal/localgov_services": {
+            "drupal/localgov_services": {
                 "drupal/core": {
                     "node_access filters out accessible nodes when node is left joined (1349080)" : "https://git.drupalcode.org/project/drupal/-/commit/c271adb.diff"
                 }