diff --git a/.circleci/config.yml b/.circleci/config.yml
index fe10785534b666..006bb5ae84eef9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -112,6 +112,16 @@ jobs:
     - BUILD_TYPE: mbedtls-build
     steps:
     - checkout
+    - run:
+        command: |
+          cat <<'EOF' | sudo tee /etc/docker/daemon.json
+          {
+            "ipv6": true,
+            "fixed-cidr-v6": "2001:db8:1::/64"
+          }
+          EOF
+          sudo service docker restart
+        name: Enable IPv6
     - run:
         command: scripts/tools/run_if.sh "ubuntu-16-lts" "$BUILD_TYPE" sudo scripts/setup/linux/install_packages.sh
         name: Setup Environment
@@ -140,6 +150,16 @@ jobs:
     - BUILD_TYPE: ubuntu-16-lts
     steps:
     - checkout
+    - run:
+        command: |
+          cat <<'EOF' | sudo tee /etc/docker/daemon.json
+          {
+            "ipv6": true,
+            "fixed-cidr-v6": "2001:db8:1::/64"
+          }
+          EOF
+          sudo service docker restart
+        name: Enable IPv6
     - run:
         command: scripts/tools/run_if.sh "ubuntu-16-lts" "$BUILD_TYPE" sudo scripts/setup/linux/install_packages.sh
         name: Setup Environment
@@ -222,6 +242,16 @@ jobs:
     - BUILD_TYPE: docker-build
     steps:
     - checkout
+    - run:
+        command: |
+          cat <<'EOF' | sudo tee /etc/docker/daemon.json
+          {
+            "ipv6": true,
+            "fixed-cidr-v6": "2001:db8:1::/64"
+          }
+          EOF
+          sudo service docker restart
+        name: Enable IPv6
     - run:
         command: scripts/tools/run_if.sh "ubuntu-16-lts" "$BUILD_TYPE" sudo scripts/setup/linux/install_packages.sh
         name: Setup Environment
@@ -372,6 +402,16 @@ workflows:
 #         type: string
 #     steps:
 #     - checkout
+#     - run:
+#         command: |
+#           cat \\<<'EOF' | sudo tee /etc/docker/daemon.json
+#           {
+#             \"ipv6\": true,
+#             \"fixed-cidr-v6\": \"2001:db8:1::/64\"
+#           }
+#           EOF
+#           sudo service docker restart
+#         name: Enable IPv6
 #     - setup-environment:
 #         builder: << parameters.builder >>
 #     - bootstrap
diff --git a/.circleci/config/jobs/build.yml b/.circleci/config/jobs/build.yml
index d073155e9180a0..2e62a348be343c 100644
--- a/.circleci/config/jobs/build.yml
+++ b/.circleci/config/jobs/build.yml
@@ -6,6 +6,16 @@ environment:
 executor: << parameters.builder >>
 steps:
     - checkout
+    - run:
+         name: Enable IPv6
+         command: |
+           cat \<<'EOF' | sudo tee /etc/docker/daemon.json
+           {
+             "ipv6": true,
+             "fixed-cidr-v6": "2001:db8:1::/64"
+           }
+           EOF
+           sudo service docker restart
     - setup-environment:
           builder: << parameters.builder >>
     - bootstrap
diff --git a/src/inet/tests/Makefile.am b/src/inet/tests/Makefile.am
index 2760a933f36c95..8ed880eceb6e09 100644
--- a/src/inet/tests/Makefile.am
+++ b/src/inet/tests/Makefile.am
@@ -105,19 +105,10 @@ COMMON_LDADD                                          = \
 # always be built to ensure overall "build sanity".
 #
 # These will NOT be part of the externally-consumable binary SDK.
-#
-# XXX - At this point TestInetEndPoint and TestInetLayerDNS are stranded
-#       here until a solution for enabling IPv6 on Linux containers for
-#       Docker on macOS can be resolved as that test involves
-#       executing APIs that exercise bind, listen, connect, accept,
-#       etc. on IPv4 and IPv6 IP end points. When that issue has been
-#       resolved, move these tests to check_PROGRAMS.
 
 noinst_PROGRAMS                                       = \
     TestLwIPDNS                                         \
-    TestInetEndPoint                                    \
     TestInetLayer                                       \
-    TestInetLayerDNS                                    \
     TestInetLayerMulticast                              \
     $(NULL)
 
@@ -126,7 +117,9 @@ noinst_PROGRAMS                                       = \
 check_PROGRAMS                                        = \
     TestInetAddress                                     \
     TestInetBuffer                                      \
+    TestInetEndPoint                                    \
     TestInetErrorStr                                    \
+    TestInetLayerDNS                                    \
     TestInetTimer                                       \
     $(NULL)