diff --git a/core/modules/simpletest/config/install/simpletest.settings.yml b/core/modules/simpletest/config/install/simpletest.settings.yml
index a2254cc..cbc26ef 100644
--- a/core/modules/simpletest/config/install/simpletest.settings.yml
+++ b/core/modules/simpletest/config/install/simpletest.settings.yml
@@ -1,4 +1,5 @@
-clear_results: true
+clear:
+  results: true
 httpauth:
   method: 1
   password: ''
diff --git a/core/modules/simpletest/config/schema/simpletest.schema.yml b/core/modules/simpletest/config/schema/simpletest.schema.yml
index 827ef56..59b9450 100644
--- a/core/modules/simpletest/config/schema/simpletest.schema.yml
+++ b/core/modules/simpletest/config/schema/simpletest.schema.yml
@@ -4,9 +4,13 @@ simpletest.settings:
   type: config_object
   label: 'Testing'
   mapping:
-    clear_results:
-      type: boolean
-      label: 'Clear results after each complete test suite run'
+    clear:
+      type: mapping
+      label: 'Clean-up options'
+      mapping:
+        results:
+          type: boolean
+          label: 'Clear test assertion results'
     verbose:
       type: boolean
       label: 'Provide verbose information when running tests'
diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index 52243c8..4896bae 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -540,7 +540,7 @@ function simpletest_generate_file($filename, $width, $lines, $type = 'binary-tex
 function simpletest_clean_environment() {
   simpletest_clean_database();
   simpletest_clean_temporary_directories();
-  if (\Drupal::config('simpletest.settings')->get('clear_results')) {
+  if (\Drupal::config('simpletest.settings')->get('clear.results')) {
     $count = simpletest_clean_results_table();
     drupal_set_message(\Drupal::translation()->formatPlural($count, 'Removed 1 test result.', 'Removed @count test results.'));
   }
@@ -611,7 +611,7 @@ function simpletest_clean_temporary_directories() {
  *   The number of results that were removed.
  */
 function simpletest_clean_results_table($test_id = NULL) {
-  if (\Drupal::config('simpletest.settings')->get('clear_results')) {
+  if (\Drupal::config('simpletest.settings')->get('clear.results')) {
     $connection = TestBase::getDatabaseConnection();
     if ($test_id) {
       $count = $connection->query('SELECT COUNT(test_id) FROM {simpletest_test_id} WHERE test_id = :test_id', array(':test_id' => $test_id))->fetchField();
diff --git a/core/modules/simpletest/src/Form/SimpletestSettingsForm.php b/core/modules/simpletest/src/Form/SimpletestSettingsForm.php
index e6d4d4d..c2613d7 100644
--- a/core/modules/simpletest/src/Form/SimpletestSettingsForm.php
+++ b/core/modules/simpletest/src/Form/SimpletestSettingsForm.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\simpletest\Form;
 
+use Drupal\Core\Database\Database;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 
@@ -41,9 +42,12 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     );
     $form['general']['simpletest_clear_results'] = array(
       '#type' => 'checkbox',
-      '#title' => $this->t('Clear results after each complete test suite run'),
-      '#description' => $this->t('By default SimpleTest will clear the results after they have been viewed on the results page, but in some cases it may be useful to leave the results in the database. The results can then be viewed at <em>admin/config/development/testing/results/[test_id]</em>. The test ID can be found in the database, simpletest table, or kept track of when viewing the results the first time. Additionally, some modules may provide more analysis or features that require this setting to be disabled.'),
-      '#default_value' => $config->get('clear_results'),
+      '#title' => $this->t('Keep test assertion results'),
+      '#description' => $this->t('Retains assertion results in the database after each test run, which can be viewed at %path. The test ID can be found in the %table database table or kept track of when viewing test results the first time.', array(
+        '%path' => 'admin/config/development/testing/results/[test_id]',
+        '%table' => Database::getConnection()->prefixTables('{simpletest}'),
+      )),
+      '#default_value' => !$config->get('clear.results'),
     );
     $form['general']['simpletest_verbose'] = array(
       '#type' => 'checkbox',
@@ -116,7 +120,7 @@ public function validateForm(array &$form, FormStateInterface $form_state) {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->config('simpletest.settings')
-      ->set('clear_results', $form_state->getValue('simpletest_clear_results'))
+      ->set('clear.results', !$form_state['values']['simpletest_clear_results'])
       ->set('verbose', $form_state->getValue('simpletest_verbose'))
       ->set('httpauth.method', $form_state->getValue('simpletest_httpauth_method'))
       ->set('httpauth.username', $form_state->getValue('simpletest_httpauth_username'))