diff --git a/core/includes/common.inc b/core/includes/common.inc
index e57efb9..59182ab 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -5169,7 +5169,7 @@ function drupal_system_listing($mask, $directory, $key = 'name', $min_depth = 1)
   // distribution we need to include the profile of the parent site (in which
   // test runs are triggered).
   if (drupal_valid_test_ua()) {
-    $testing_profile = variable_get('simpletest_parent_profile', FALSE);
+    $testing_profile = config('simpletest.settings')->get('parent_profile');
     if ($testing_profile && $testing_profile != $profile) {
       $profiles[] = $testing_profile;
     }
diff --git a/core/modules/simpletest/config/simpletest.settings.yml b/core/modules/simpletest/config/simpletest.settings.yml
new file mode 100644
index 0000000..76311b8
--- /dev/null
+++ b/core/modules/simpletest/config/simpletest.settings.yml
@@ -0,0 +1,7 @@
+clear_results: 1
+httpauth.method: 1
+httpauth.password:
+httpauth.username:
+maximum_redirects: 5
+parent_profile: 0
+verbose: 1
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
index 794054d..605e59d 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
@@ -483,10 +483,11 @@ abstract class TestBase {
 
     // HTTP auth settings (<username>:<password>) for the simpletest browser
     // when sending requests to the test site.
-    $this->httpauth_method = variable_get('simpletest_httpauth_method', CURLAUTH_BASIC);
-    $username = variable_get('simpletest_httpauth_username', NULL);
-    $password = variable_get('simpletest_httpauth_password', NULL);
-    if ($username && $password) {
+    $simpletest_config = config('simpletest.settings');
+    $this->httpauth_method = $simpletest_config->get('httpauth.method');
+    $username = $simpletest_config->get('httpauth.username');
+    $password = $simpletest_config->get('httpauth.password');
+    if (!empty($username) && !empty($password)) {
       $this->httpauth_credentials = $username . ':' . $password;
     }
 
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/SimpleTestTest.php b/core/modules/simpletest/lib/Drupal/simpletest/Tests/SimpleTestTest.php
index 938054a..4324f2a 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/Tests/SimpleTestTest.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/Tests/SimpleTestTest.php
@@ -76,7 +76,7 @@ class SimpleTestTest extends WebTestBase {
         'name' => $user->name,
         'pass' => $user->pass_raw
       );
-      variable_set('simpletest_maximum_redirects', 1);
+      config('simpletest.settings')->set('maximum_redirects', 1);
       $this->drupalPost('user', $edit, t('Log in'), array(
         'query' => array('destination' => 'user/logout'),
       ));
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
index 73afaa6..048315f 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php
@@ -625,7 +625,7 @@ abstract class WebTestBase extends TestBase {
     // search path to the child site's search paths.
     // @see drupal_system_listing()
     // @todo This may need to be primed like 'install_profile' above.
-    variable_set('simpletest_parent_profile', $this->originalProfile);
+    config('simpletest.settings')->set('parent_profile', $this->originalProfile);
 
     // Include the testing profile.
     variable_set('install_profile', $this->profile);
@@ -910,7 +910,7 @@ abstract class WebTestBase extends TestBase {
     // to prevent fragments being sent to the web server as part
     // of the request.
     // TODO: Remove this for Drupal 8, since fixed in curl 7.20.0.
-    if (in_array($status, array(300, 301, 302, 303, 305, 307)) && $this->redirect_count < variable_get('simpletest_maximum_redirects', 5)) {
+    if (in_array($status, array(300, 301, 302, 303, 305, 307)) && $this->redirect_count < config('simpletest.settings')->get('maximum_redirects')) {
       if ($this->drupalGetHeader('location')) {
         $this->redirect_count++;
         $curl_options = array();
diff --git a/core/modules/simpletest/simpletest.install b/core/modules/simpletest/simpletest.install
index 23db4dc..aa1bf18 100644
--- a/core/modules/simpletest/simpletest.install
+++ b/core/modules/simpletest/simpletest.install
@@ -171,12 +171,25 @@ function simpletest_uninstall() {
   simpletest_clean_database();
 
   // Remove settings variables.
-  variable_del('simpletest_httpauth_method');
-  variable_del('simpletest_httpauth_username');
-  variable_del('simpletest_httpauth_password');
-  variable_del('simpletest_clear_results');
-  variable_del('simpletest_verbose');
+  config('simpletest.settings')
+    ->delete('clear_results')
+    ->delete('httpauth.method')
+    ->delete('httpauth.password')
+    ->delete('httpauth.username')
+    ->delete('maximum_redirects')
+    ->delete('parent_profile')
+    ->delete('verbose');
 
   // Remove generated files.
   file_unmanaged_delete_recursive('public://simpletest');
 }
+
+function simpletest_update_8000() {
+   update_variables_to_config('simpletest.settings', array('simpletest_clear_results' => 'clear_results'));
+   update_variables_to_config('simpletest.settings', array('simpletest_httpauth_password' => 'httpauth.method'));
+   update_variables_to_config('simpletest.settings', array('simpletest_httpauth_password' => 'httpauth.password'));
+   update_variables_to_config('simpletest.settings', array('simpletest_httpauth_username' => 'httpauth.username'));
+   update_variables_to_config('simpletest.settings', array('simpletest_maximum_redirects' => 'maximum_redirects'));
+   update_variables_to_config('simpletest.settings', array('simpletest_parent_profile' => 'parent_profile'));
+   update_variables_to_config('simpletest.settings', array('simpletest_verbose' => 'verbose'));
+}
diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index 38c360b..efc4acb 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -460,7 +460,7 @@ function simpletest_generate_file($filename, $width, $lines, $type = 'binary-tex
 function simpletest_clean_environment() {
   simpletest_clean_database();
   simpletest_clean_temporary_directories();
-  if (variable_get('simpletest_clear_results', TRUE)) {
+  if (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.'));
   }
@@ -530,7 +530,7 @@ function simpletest_clean_temporary_directories() {
  *   The number of results removed.
  */
 function simpletest_clean_results_table($test_id = NULL) {
-  if (variable_get('simpletest_clear_results', TRUE)) {
+  if (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();
 
@@ -604,7 +604,7 @@ function simpletest_verbose($message, $original_file_directory = NULL, $test_cla
   if ($original_file_directory) {
     $file_directory = $original_file_directory;
     $class = $test_class;
-    $verbose = variable_get('simpletest_verbose', TRUE);
+    $verbose = config('simpletest.settings')->get('verbose');
     $directory = $file_directory . '/simpletest/verbose';
     $writable = file_prepare_directory($directory, FILE_CREATE_DIRECTORY);
     if ($writable && !file_exists($directory . '/.htaccess')) {
diff --git a/core/modules/simpletest/simpletest.pages.inc b/core/modules/simpletest/simpletest.pages.inc
index a98b445..56c91d9 100644
--- a/core/modules/simpletest/simpletest.pages.inc
+++ b/core/modules/simpletest/simpletest.pages.inc
@@ -436,6 +436,7 @@ function simpletest_result_status_image($status) {
  * @see simpletest_settings_form_validate()
  */
 function simpletest_settings_form($form, &$form_state) {
+  $simpletest_config = config('simpletest.settings');
   $form['general'] = array(
     '#type' => 'fieldset',
     '#title' => t('General'),
@@ -444,13 +445,13 @@ function simpletest_settings_form($form, &$form_state) {
     '#type' => 'checkbox',
     '#title' => t('Clear results after each complete test suite run'),
     '#description' => 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/[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' => variable_get('simpletest_clear_results', TRUE),
+    '#default_value' => $simpletest_config->get('clear_results'),
   );
   $form['general']['simpletest_verbose'] = array(
     '#type' => 'checkbox',
     '#title' => t('Provide verbose information when running tests'),
     '#description' => 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' => variable_get('simpletest_verbose', TRUE),
+    '#default_value' => $simpletest_config->get('verbose'),
   );
 
   $form['httpauth'] = array(
@@ -471,16 +472,16 @@ function simpletest_settings_form($form, &$form_state) {
       CURLAUTH_ANY => t('Any'),
       CURLAUTH_ANYSAFE => t('Any safe'),
     ),
-    '#default_value' => variable_get('simpletest_httpauth_method', CURLAUTH_BASIC),
+    '#default_value' => $simpletest_config->get('httpauth.method'),
   );
-  $username = variable_get('simpletest_httpauth_username');
-  $password = variable_get('simpletest_httpauth_password');
+  $username = $simpletest_config->get('httpauth.username');
+  $password = $simpletest_config->get('httpauth.password');
   $form['httpauth']['simpletest_httpauth_username'] = array(
     '#type' => 'textfield',
     '#title' => t('Username'),
     '#default_value' => $username,
   );
-  if ($username && $password) {
+  if (!empty($username) && !empty($password)) {
     $form['httpauth']['simpletest_httpauth_username']['#description'] = t('Leave this blank to delete both the existing username and password.');
   }
   $form['httpauth']['simpletest_httpauth_password'] = array(
@@ -491,7 +492,22 @@ function simpletest_settings_form($form, &$form_state) {
     $form['httpauth']['simpletest_httpauth_password']['#description'] = t('To change the password, enter the new password here.');
   }
 
-  return system_settings_form($form);
+  return system_config_form($form, $form_state);
+}
+
+/**
+ * Form submission handler for simpletest_settings_form().
+ *
+ * @ingroup forms
+ */
+function simpletest_settings_form_submit($form, &$form_state) {
+  config('simpletest.settings')
+    ->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'])
+    ->set('httpauth.password', $form_state['values']['simpletest_httpauth_password'])
+    ->save();
 }
 
 /**
@@ -501,7 +517,7 @@ function simpletest_settings_form_validate($form, &$form_state) {
   // If a username was provided but a password wasn't, preserve the existing
   // password.
   if (!empty($form_state['values']['simpletest_httpauth_username']) && empty($form_state['values']['simpletest_httpauth_password'])) {
-    $form_state['values']['simpletest_httpauth_password'] = variable_get('simpletest_httpauth_password', '');
+    $form_state['values']['simpletest_httpauth_password'] = config('simpletest.settings')->get('httpauth.password');
   }
 
   // If a password was provided but a username wasn't, the credentials are