diff --git a/azure/msan_job.yml b/azure/msan_job.yml
index 0c7475be5b6..919547b1185 100644
--- a/azure/msan_job.yml
+++ b/azure/msan_job.yml
@@ -8,7 +8,7 @@ jobs:
   - job: ${{ parameters.configurationName }}
     timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
     pool:
-      vmImage: 'ubuntu-18.04'
+      vmImage: 'ubuntu-20.04'
     steps:
     - template: apt.yml
     - script: |
diff --git a/azure/test.yml b/azure/test.yml
index f96075c20d0..13fa12700d3 100644
--- a/azure/test.yml
+++ b/azure/test.yml
@@ -15,7 +15,6 @@ steps:
       export TEST_PHP_JUNIT=junit.xml
       export REPORT_EXIT_STATUS=no
       export SKIP_IO_CAPTURE_TESTS=1
-      export MSAN_SYMBOLIZER_PATH=/usr/lib/llvm-6.0/bin/llvm-symbolizer
       rm -rf junit.xml | true
       sapi/cli/php run-tests.php -P -q \
           -j$(/usr/bin/nproc) \
diff --git a/ext/standard/tests/general_functions/getservbyname_basic.phpt b/ext/standard/tests/general_functions/getservbyname_basic.phpt
index 51086f80267..6d26cfedc38 100644
--- a/ext/standard/tests/general_functions/getservbyname_basic.phpt
+++ b/ext/standard/tests/general_functions/getservbyname_basic.phpt
@@ -7,9 +7,10 @@ Michele Orselli (mo@ideato.it)
 Simone Gentili (sensorario@gmail.com)
 --SKIPIF--
 <?php
-    if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
-        if (!file_exists("/etc/services")) die("skip reason: missing /etc/services");
-    }
+if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
+    if (!file_exists("/etc/services")) die("skip reason: missing /etc/services");
+}
+if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for getservbyname()');
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/general_functions/getservbyport_basic.phpt b/ext/standard/tests/general_functions/getservbyport_basic.phpt
index 6ab4d872074..817d4fd3ca2 100644
--- a/ext/standard/tests/general_functions/getservbyport_basic.phpt
+++ b/ext/standard/tests/general_functions/getservbyport_basic.phpt
@@ -7,9 +7,10 @@ Michele Orselli (mo@ideato.it)
 Simone Gentili (sensorario@gmail.com)
 --SKIPIF--
 <?php
-    if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
-        if (!file_exists("/etc/services")) die("skip reason: missing /etc/services");
-    }
+if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
+    if (!file_exists("/etc/services")) die("skip reason: missing /etc/services");
+}
+if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for getservbyport()');
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/general_functions/getservbyport_variation1.phpt b/ext/standard/tests/general_functions/getservbyport_variation1.phpt
index 03cc5b46e95..9d9cc04b0ab 100644
--- a/ext/standard/tests/general_functions/getservbyport_variation1.phpt
+++ b/ext/standard/tests/general_functions/getservbyport_variation1.phpt
@@ -9,9 +9,10 @@ Michele Orselli (mo@ideato.it)
 Simone Gentili (sensorario@gmail.com)
 --SKIPIF--
 <?php
-    if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
-        if (!file_exists("/etc/services")) die("skip reason: missing /etc/services");
-    }
+if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
+    if (!file_exists("/etc/services")) die("skip reason: missing /etc/services");
+}
+if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for getservbyport()');
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/network/getmxrr.phpt b/ext/standard/tests/network/getmxrr.phpt
index 1a005dfdd99..d49af6678e5 100644
--- a/ext/standard/tests/network/getmxrr.phpt
+++ b/ext/standard/tests/network/getmxrr.phpt
@@ -7,6 +7,7 @@ if (getenv("SKIP_ONLINE_TESTS")) die("skip test requiring internet connection");
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip: no Windows support');
 }
+if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for dn_expand()');
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/network/getprotobyname_basic.phpt b/ext/standard/tests/network/getprotobyname_basic.phpt
index 1c02a6cc0fd..a1255ca2728 100644
--- a/ext/standard/tests/network/getprotobyname_basic.phpt
+++ b/ext/standard/tests/network/getprotobyname_basic.phpt
@@ -4,13 +4,14 @@ getprotobyname function basic test
 edgarsandi - <edgar.r.sandi@gmail.com>
 --SKIPIF--
 <?php
-    if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
-        if (!file_exists("/etc/protocols")) die("skip reason: missing /etc/protocols");
-    }
+if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
+    if (!file_exists("/etc/protocols")) die("skip reason: missing /etc/protocols");
+}
+if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for getprotobyname()');
 ?>
 --FILE--
 <?php
-    var_dump(getprotobyname('tcp'));
+var_dump(getprotobyname('tcp'));
 ?>
 --EXPECT--
 int(6)
diff --git a/ext/standard/tests/network/getprotobyname_error.phpt b/ext/standard/tests/network/getprotobyname_error.phpt
index 52ef3b8ee08..c2f55b833a1 100644
--- a/ext/standard/tests/network/getprotobyname_error.phpt
+++ b/ext/standard/tests/network/getprotobyname_error.phpt
@@ -2,6 +2,10 @@
 getprotobyname function errors test
 --CREDITS--
 edgarsandi - <edgar.r.sandi@gmail.com>
+--SKIPIF--
+<?php
+if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for getprotobyname()');
+?>
 --FILE--
 <?php
 // invalid protocol name
diff --git a/ext/standard/tests/network/getprotobynumber_basic.phpt b/ext/standard/tests/network/getprotobynumber_basic.phpt
index 2441cbc9c16..a3ac1557812 100644
--- a/ext/standard/tests/network/getprotobynumber_basic.phpt
+++ b/ext/standard/tests/network/getprotobynumber_basic.phpt
@@ -4,13 +4,14 @@ getprotobynumber function basic test
 edgarsandi - <edgar.r.sandi@gmail.com>
 --SKIPIF--
 <?php
-    if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
-        if (!file_exists("/etc/protocols")) die("skip reason: missing /etc/protocols");
-    }
+if(in_array(PHP_OS_FAMILY, ['BSD', 'Darwin', 'Solaris', 'Linux'])){
+    if (!file_exists("/etc/protocols")) die("skip reason: missing /etc/protocols");
+}
+if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for getprotobynumber()');
 ?>
 --FILE--
 <?php
-    var_dump(getprotobynumber(6));
+var_dump(getprotobynumber(6));
 ?>
 --EXPECT--
 string(3) "tcp"
diff --git a/ext/standard/tests/network/getprotobynumber_error.phpt b/ext/standard/tests/network/getprotobynumber_error.phpt
index dda2661b5ad..f6a669fc057 100644
--- a/ext/standard/tests/network/getprotobynumber_error.phpt
+++ b/ext/standard/tests/network/getprotobynumber_error.phpt
@@ -2,6 +2,10 @@
 getprotobynumber function errors test
 --CREDITS--
 edgarsandi - <edgar.r.sandi@gmail.com>
+--SKIPIF--
+<?php
+if (getenv('SKIP_MSAN')) die('skip msan missing interceptor for getprotobynumber()');
+?>
 --FILE--
 <?php
 // invalid protocol number