diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
index d5b68b9458ab2b..5db71c7006b22c 100644
--- a/test/parallel/parallel.status
+++ b/test/parallel/parallel.status
@@ -12,13 +12,6 @@ test-tick-processor     : PASS,FLAKY
 [$system==linux]
 test-tick-processor     : PASS,FLAKY
 
-# Flaky until https://github.com/nodejs/build/issues/415 is resolved.
-# On some of the buildbots, AAAA queries for localhost don't resolve
-# to an address and neither do any of the alternatives from the
-# localIPv6Hosts list from test/common.js.
-test-https-connect-address-family : PASS,FLAKY
-test-tls-connect-address-family : PASS,FLAKY
-
 [$system==macos]
 
 [$system==solaris] # Also applies to SmartOS
diff --git a/test/parallel/test-https-connect-address-family.js b/test/parallel/test-https-connect-address-family.js
index 12a7fd282a4346..569f3fdc1b84bb 100644
--- a/test/parallel/test-https-connect-address-family.js
+++ b/test/parallel/test-https-connect-address-family.js
@@ -32,8 +32,13 @@ function runTest() {
 }
 
 dns.lookup('localhost', {family: 6, all: true}, (err, addresses) => {
-  if (err)
+  if (err) {
+    if (err.code === 'ENOTFOUND') {
+      common.skip('localhost does not resolve to ::1');
+      return;
+    }
     throw err;
+  }
 
   if (addresses.some((val) => val.address === '::1'))
     runTest();
diff --git a/test/parallel/test-tls-connect-address-family.js b/test/parallel/test-tls-connect-address-family.js
index e21cf540e0d522..05e81304b6a379 100644
--- a/test/parallel/test-tls-connect-address-family.js
+++ b/test/parallel/test-tls-connect-address-family.js
@@ -31,8 +31,13 @@ function runTest() {
 }
 
 dns.lookup('localhost', {family: 6, all: true}, (err, addresses) => {
-  if (err)
+  if (err) {
+    if (err.code === 'ENOTFOUND') {
+      common.skip('localhost does not resolve to ::1');
+      return;
+    }
     throw err;
+  }
 
   if (addresses.some((val) => val.address === '::1'))
     runTest();