diff --git a/akka-http-core/src/test/scala/akka/http/impl/engine/client/ConnectionPoolSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/client/ConnectionPoolSpec.scala
index e287b92add..02ba7a5d94 100644
--- a/akka-http-core/src/test/scala/akka/http/impl/engine/client/ConnectionPoolSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/impl/engine/client/ConnectionPoolSpec.scala
@@ -26,8 +26,7 @@ import akka.http.scaladsl.model._
 class ConnectionPoolSpec extends AkkaSpec("""
     akka.loggers = []
     akka.loglevel = OFF
-    akka.io.tcp.trace-logging = off
-    akka.io.tcp.windows-connection-abort-workaround-enabled=auto""") {
+    akka.io.tcp.trace-logging = off""") {
   implicit val materializer = ActorMaterializer()
 
   // FIXME: Extract into proper util class to be reusable
diff --git a/akka-http-core/src/test/scala/akka/http/impl/engine/client/TlsEndpointVerificationSpec.scala b/akka-http-core/src/test/scala/akka/http/impl/engine/client/TlsEndpointVerificationSpec.scala
index 1d54b00141..dd875a3ca4 100644
--- a/akka-http-core/src/test/scala/akka/http/impl/engine/client/TlsEndpointVerificationSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/impl/engine/client/TlsEndpointVerificationSpec.scala
@@ -21,8 +21,7 @@ import javax.net.ssl.SSLException
 
 class TlsEndpointVerificationSpec extends AkkaSpec("""
     akka.loglevel = DEBUG
-    akka.io.tcp.trace-logging = off
-    akka.io.tcp.windows-connection-abort-workaround-enabled=auto""") with ScalaFutures {
+    akka.io.tcp.trace-logging = off""") with ScalaFutures {
   implicit val materializer = ActorMaterializer()
   val timeout = Timeout(Span(3, Seconds))
 
diff --git a/akka-http-core/src/test/scala/akka/http/scaladsl/ClientServerSpec.scala b/akka-http-core/src/test/scala/akka/http/scaladsl/ClientServerSpec.scala
index eca0ed7e50..aa954bbcba 100644
--- a/akka-http-core/src/test/scala/akka/http/scaladsl/ClientServerSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/scaladsl/ClientServerSpec.scala
@@ -33,7 +33,6 @@ class ClientServerSpec extends WordSpec with Matchers with BeforeAndAfterAll {
     akka.loglevel = ERROR
     akka.stdout-loglevel = ERROR
     akka.log-dead-letters = OFF
-    akka.io.tcp.windows-connection-abort-workaround-enabled = auto
   """)
   implicit val system = ActorSystem(getClass.getSimpleName, testConf)
   import system.dispatcher
diff --git a/akka-stream-tests/src/test/scala/akka/stream/io/TcpSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/TcpSpec.scala
index 2ed5dbc48e..0bf1e8f879 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/io/TcpSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/io/TcpSpec.scala
@@ -19,10 +19,7 @@ import scala.concurrent.duration._
 import java.net.BindException
 import akka.testkit.EventFilter
 
-class TcpSpec extends AkkaSpec(
-  """
-    |akka.io.tcp.windows-connection-abort-workaround-enabled=auto
-    |akka.stream.materializer.subscription-timeout.timeout = 2s""".stripMargin) with TcpHelper {
+class TcpSpec extends AkkaSpec("akka.stream.materializer.subscription-timeout.timeout = 2s") with TcpHelper {
   var demand = 0L
 
   "Outgoing TCP stream" must {