diff --git a/composer.json b/composer.json
index 760db034..44032fc7 100644
--- a/composer.json
+++ b/composer.json
@@ -6,6 +6,12 @@
   "keywords": ["php", "layout", "drupal"],
   "homepage": "https://www.drupal.org/project/ds",
   "minimum-stability": "dev",
+  "require": {
+    "drupal/core": "^9"
+  },
+  "require-dev": {
+    "drupal/field_group": "3.x-dev",
+  },
   "authors": [
     {
       "name": "Bram Goffings",
diff --git a/ds.info.yml b/ds.info.yml
index dabdca62..e147246e 100644
--- a/ds.info.yml
+++ b/ds.info.yml
@@ -6,5 +6,5 @@ package: 'Display Suite'
 configure: ds.structure
 dependencies:
   - drupal:layout_discovery
-#test_dependencies:
-#  - field_group:field_group
+test_dependencies:
+  - field_group:field_group
diff --git a/tests/src/Functional/FieldGroupTest.php b/tests/src/Functional/FieldGroupTest.php
index d7ff8abb..740cdd6c 100644
--- a/tests/src/Functional/FieldGroupTest.php
+++ b/tests/src/Functional/FieldGroupTest.php
@@ -7,20 +7,17 @@ use Drupal\Tests\field_group\Functional\FieldGroupTestTrait;
 /**
  * Tests for field group integration with Display Suite.
  *
- * @group ds_disabled_test
+ * @group ds
  */
 class FieldGroupTest extends TestBase {
 
-  //use FieldGroupTestTrait;
+  use FieldGroupTestTrait;
 
   /**
    * Test tabs.
    */
   public function testFieldPlugin() {
 
-    // Disable the test for now until field group fixed it's schema definition
-    return;
-
     // Create a node.
     $settings = ['type' => 'article', 'promote' => 1];
     /* @var \Drupal\node\NodeInterface $node */
diff --git a/tests/src/Functional/TestBase.php b/tests/src/Functional/TestBase.php
index 86fcf9eb..50f4bc34 100644
--- a/tests/src/Functional/TestBase.php
+++ b/tests/src/Functional/TestBase.php
@@ -42,7 +42,7 @@ abstract class TestBase extends BrowserTestBase {
     'ds_test',
     'ds_switch_view_mode',
     'layout_discovery',
-    //'field_group',
+    'field_group',
   ];
 
   /**