diff --git a/tests/src/Functional/Lock/RedisLockFunctionalTest.php b/tests/src/Functional/Lock/RedisLockFunctionalTest.php
index 7273924..c93a925 100644
--- a/tests/src/Functional/Lock/RedisLockFunctionalTest.php
+++ b/tests/src/Functional/Lock/RedisLockFunctionalTest.php
@@ -22,7 +22,7 @@ class RedisLockFunctionalTest extends LockFunctionalTest {
    *
    * @var array
    */
-  public static $modules = ['redis'];
+  protected static $modules = ['redis'];
 
   /**
    * {@inheritdoc}
@@ -39,8 +39,12 @@ class RedisLockFunctionalTest extends LockFunctionalTest {
     $module_path = \Drupal::service('extension.list.module')->getPath('redis');
     $contents .= "\n\n" . "\$settings['container_yamls'][] = '$module_path/example.services.yml';";
     $contents .= "\n\n" . '$settings["redis.connection"]["interface"] = \'' . $redis_interface . '\';';
-    file_put_contents($filename, $contents);
     $settings = Settings::getAll();
+    if ($host = getenv('REDIS_HOST')) {
+      $contents .= "\n\n" . '$settings["redis.connection"]["host"] = "' . $host . '";';
+      $settings['redis.connection']['host'] = $host;
+    }
+    file_put_contents($filename, $contents);
     $settings['container_yamls'][] = $module_path . '/example.services.yml';
     $settings['redis.connection']['interface'] = $redis_interface;
     new Settings($settings);
diff --git a/tests/src/Functional/WebTest.php b/tests/src/Functional/WebTest.php
index 6245091..fca49dc 100644
--- a/tests/src/Functional/WebTest.php
+++ b/tests/src/Functional/WebTest.php
@@ -24,7 +24,7 @@ class WebTest extends BrowserTestBase {
    *
    * @var array
    */
-  public static $modules = ['redis', 'block'];
+  protected static $modules = ['redis', 'block'];
 
   /**
    * {@inheritdoc}
@@ -46,6 +46,11 @@ class WebTest extends BrowserTestBase {
     // Get REDIS_INTERFACE env variable.
     $redis_interface = self::getRedisInterfaceEnv();
     $settings['redis.connection']['interface'] = $redis_interface;
+
+    if ($host = getenv('REDIS_HOST')) {
+      $settings['redis.connection']['host'] = $host;
+    }
+
     $settings['redis_compress_length'] = 100;
 
     $settings['cache'] = [
@@ -91,6 +96,10 @@ class WebTest extends BrowserTestBase {
     $contents .= "\n\n" . '$settings["cache"] = ' . var_export($settings['cache'], TRUE) . ';';
     $contents .= "\n\n" . '$settings["redis_compress_length"] = 100;';
 
+    if ($host = getenv('REDIS_HOST')) {
+      $contents .= "\n\n" . '$settings["redis.connection"]["host"] = "' . $host . '";';
+    }
+
     // Add the classloader.
     $contents .= "\n\n" . '$class_loader->addPsr4(\'Drupal\\\\redis\\\\\', \'' . \Drupal::service('extension.list.module')->getPath('redis') . '/src\');';
 
diff --git a/tests/src/Kernel/RedisCacheTest.php b/tests/src/Kernel/RedisCacheTest.php
index 8668be3..ba5fc1d 100644
--- a/tests/src/Kernel/RedisCacheTest.php
+++ b/tests/src/Kernel/RedisCacheTest.php
@@ -21,7 +21,7 @@ class RedisCacheTest extends GenericCacheBackendUnitTestBase {
    *
    * @var array
    */
-  public static $modules = ['system', 'redis'];
+  protected static $modules = ['system', 'redis'];
 
   public function register(ContainerBuilder $container) {
     self::setUpSettings();
diff --git a/tests/src/Kernel/RedisFloodTest.php b/tests/src/Kernel/RedisFloodTest.php
index 62dd416..3c5ab71 100644
--- a/tests/src/Kernel/RedisFloodTest.php
+++ b/tests/src/Kernel/RedisFloodTest.php
@@ -20,7 +20,7 @@ class RedisFloodTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = ['redis'];
+  protected static $modules = ['redis'];
 
   /**
    * Test flood control.
diff --git a/tests/src/Kernel/RedisQueueTest.php b/tests/src/Kernel/RedisQueueTest.php
index 3d728da..2ee031a 100644
--- a/tests/src/Kernel/RedisQueueTest.php
+++ b/tests/src/Kernel/RedisQueueTest.php
@@ -20,7 +20,7 @@ class RedisQueueTest extends CoreQueueTest {
    *
    * @var array
    */
-  public static $modules = ['redis'];
+  protected static $modules = ['redis'];
 
   /**
    * Tests Redis non-blocking queue.
diff --git a/tests/src/Traits/RedisTestInterfaceTrait.php b/tests/src/Traits/RedisTestInterfaceTrait.php
index 092b8c7..dcbec57 100644
--- a/tests/src/Traits/RedisTestInterfaceTrait.php
+++ b/tests/src/Traits/RedisTestInterfaceTrait.php
@@ -15,6 +15,11 @@ trait RedisTestInterfaceTrait {
     $redis_interface = self::getRedisInterfaceEnv();
     $settings = Settings::getAll();
     $settings['redis.connection']['interface'] = $redis_interface;
+
+    if ($host = getenv('REDIS_HOST')) {
+      $settings['redis.connection']['host'] = $host;
+    }
+
     new Settings($settings);
   }