diff --git a/core/modules/simpletest/config/schema/simpletest.schema.yml b/core/modules/simpletest/config/schema/simpletest.schema.yml
index 5423adc..96f3afd 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: mapping
   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/config/simpletest.settings.yml b/core/modules/simpletest/config/simpletest.settings.yml
index a2254cc..cbc26ef 100644
--- a/core/modules/simpletest/config/simpletest.settings.yml
+++ b/core/modules/simpletest/config/simpletest.settings.yml
@@ -1,4 +1,5 @@
-clear_results: true
+clear:
+  results: true
 httpauth:
   method: 1
   password: ''
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestSettingsForm.php b/core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestSettingsForm.php
index 24bdb85..114b2d8 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestSettingsForm.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/Form/SimpletestSettingsForm.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\simpletest\Form;
 
+use Drupal\Core\Database\Database;
 use Drupal\Core\Form\ConfigFormBase;
 
 /**
@@ -30,18 +31,21 @@ public function buildForm(array $form, array &$form_state) {
       '#type' => 'details',
       '#title' => $this->t('General'),
     );
-    $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'),
-    );
     $form['general']['simpletest_verbose'] = array(
       '#type' => 'checkbox',
       '#title' => $this->t('Provide verbose information when running tests'),
       '#description' => $this->t('The verbose data will be printed along with the standard assertions and is useful for debugging. The verbose data will be erased between each test suite run. The verbose data output is very detailed and should only be used when debugging.'),
       '#default_value' => $config->get('verbose'),
     );
+    $form['general']['simpletest_clear_results'] = array(
+      '#type' => 'checkbox',
+      '#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['httpauth'] = array(
       '#type' => 'details',
@@ -108,7 +112,7 @@ public function validateForm(array &$form, array &$form_state) {
    */
   public function submitForm(array &$form, array &$form_state) {
     $this->configFactory->get('simpletest.settings')
-      ->set('clear_results', $form_state['values']['simpletest_clear_results'])
+      ->set('clear.results', !$form_state['values']['simpletest_clear_results'])
       ->set('verbose', $form_state['values']['simpletest_verbose'])
       ->set('httpauth.method', $form_state['values']['simpletest_httpauth_method'])
       ->set('httpauth.username', $form_state['values']['simpletest_httpauth_username'])
diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index 3571da9..9e9180e 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -602,7 +602,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(format_plural($count, 'Removed 1 test result.', 'Removed @count test results.'));
   }
@@ -672,7 +672,7 @@ function simpletest_clean_temporary_directories() {
  *   The number of results 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')) {
     if ($test_id) {
       $count = db_query('SELECT COUNT(test_id) FROM {simpletest_test_id} WHERE test_id = :test_id', array(':test_id' => $test_id))->fetchField();