diff --git a/core/modules/workspace/tests/src/Functional/WorkspacePermissionsTest.php b/core/modules/workspace/tests/src/Functional/WorkspacePermissionsTest.php
index 3f95cd3..5e3f356 100644
--- a/core/modules/workspace/tests/src/Functional/WorkspacePermissionsTest.php
+++ b/core/modules/workspace/tests/src/Functional/WorkspacePermissionsTest.php
@@ -69,8 +69,7 @@ public function testEditOwnWorkspace() {
     $this->assertSession()->statusCodeEquals(200);
 
     $page = $this->getSession()->getPage();
-    $page->fillField('label', 'Bears again');
-    $page->fillField('id', 'bears');
+    $page->fillField('label[0][value]', 'Bears again');
     $page->findButton('Save')->click();
     $page->hasContent('Bears again (bears)');
 
@@ -113,8 +112,7 @@ public function testEditAnyWorkspace() {
     $this->assertSession()->statusCodeEquals(200);
 
     $page = $this->getSession()->getPage();
-    $page->fillField('label', 'Bears again');
-    $page->fillField('id', 'bears');
+    $page->fillField('label[0][value]', 'Bears again');
     $page->findButton('Save')->click();
     $page->hasContent('Bears again (bears)');
 
diff --git a/core/modules/workspace/tests/src/Functional/WorkspaceTest.php b/core/modules/workspace/tests/src/Functional/WorkspaceTest.php
index dbf2d8b..83c0d78 100644
--- a/core/modules/workspace/tests/src/Functional/WorkspaceTest.php
+++ b/core/modules/workspace/tests/src/Functional/WorkspaceTest.php
@@ -63,8 +63,8 @@ public function testSpecialCharacters() {
     $this->assertSession()->statusCodeEquals(200);
 
     $page = $this->getSession()->getPage();
-    $page->fillField('label', 'workspace2');
-    $page->fillField('id', 'A!"£%^&*{}#~@?');
+    $page->fillField('label[0][value]', 'workspace2');
+    $page->fillField('id[0][value]', 'A!"£%^&*{}#~@?');
     $page->findButton('Save')->click();
     $page->hasContent("This value is not valid");
   }
@@ -76,8 +76,8 @@ public function testWorkspaceOwner() {
     $this->drupalLogin($this->editor1);
 
     $this->drupalPostForm('/admin/config/workflow/workspace/add', [
-      'id' => 'test_workspace',
-      'label' => 'Test workspace',
+      'id[0][value]' => 'test_workspace',
+      'label[0][value]' => 'Test workspace',
     ], 'Save');
 
     $storage = \Drupal::entityTypeManager()->getStorage('workspace');