diff --git a/src/Tests/ParagraphsAdministrationTest.php b/src/Tests/ParagraphsAdministrationTest.php
index cdc3be9..0cd4729 100644
--- a/src/Tests/ParagraphsAdministrationTest.php
+++ b/src/Tests/ParagraphsAdministrationTest.php
@@ -225,7 +225,7 @@ class ParagraphsAdministrationTest extends WebTestBase {
 
     $this->drupalPostAjaxForm(NULL, array(), $field_name . "_settings_edit");
     // Assert the 'Buttons' option is selected.
-    $this->assertRaw('<option value="button" selected>Buttons</option>');
+    $this->assertOptionSelected('edit-fields-field-paragraphs-settings-edit-form-settings-add-mode', 'button', 'Updated value is correct!.');
 
     // Add two Text + Image paragraphs in article.
     $this->drupalGet('node/add/article');
@@ -274,7 +274,7 @@ class ParagraphsAdministrationTest extends WebTestBase {
     $this->assertText('Edit mode: Closed', 'Checking the settings value.');
     $this->drupalPostAjaxForm(NULL, array(), "field_paragraphs_settings_edit");
     // Assert the 'Closed' option is selected.
-    $this->assertRaw('<option value="closed" selected>Closed</option>');
+    $this->assertOptionSelected('edit-fields-field-paragraphs-settings-edit-form-settings-edit-mode', 'closed', 'Updated value correctly.');
     $this->drupalGet('node/1/edit');
     // The textareas for paragraphs should not be visible.
     $this->assertNoRaw('field_paragraphs[0][subform][field_text][0][value]');
@@ -299,7 +299,7 @@ class ParagraphsAdministrationTest extends WebTestBase {
     $this->drupalGet('admin/structure/types/manage/article/form-display');
     $this->drupalPostAjaxForm(NULL, array(), "field_paragraphs_settings_edit");
     // Assert the 'Preview' option is selected.
-    $this->assertRaw('<option value="preview" selected>Preview</option>');
+    $this->assertOptionSelected('edit-fields-field-paragraphs-settings-edit-form-settings-edit-mode', 'preview', 'Updated value correctly.');
     // Restore the value to Open for next test.
     $edit = array('fields[field_paragraphs][settings_edit_form][settings][edit_mode]' => 'open');
     $this->drupalPostForm(NULL, $edit, t('Save'));