diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 46a18bcea1..fc2bca5fc0 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -45,28 +45,28 @@ jobs:
     - bash: scripts/ci/azure/run.sh test
       name: Test
 
-#- job: macos
-#  timeoutInMinutes: 90
-#  strategy:
-#    matrix:
-#      macos1014_xcode103_ninja:
-#        hostImage: 'macOS-10.14'
-#      macos1015_xcode111_make:
-#        hostImage: 'macOS-10.15'
-#
-#  pool:
-#    vmImage: $[ variables['hostImage'] ]
-#  steps:
-#    - bash: scripts/ci/azure/macos-setup.sh
-#      name: Setup
-#    - bash: scripts/ci/azure/run.sh update
-#      name: Update
-#    - bash: scripts/ci/azure/run.sh configure
-#      name: Configure
-#    - bash: scripts/ci/azure/run.sh build
-#      name: Build
-#    - bash: scripts/ci/azure/run.sh test
-#      name: Test
+- job: macos
+  timeoutInMinutes: 90
+  strategy:
+    matrix:
+      macos1014_xcode103_ninja:
+        hostImage: 'macOS-10.14'
+      macos1015_xcode111_make:
+        hostImage: 'macOS-10.15'
+
+  pool:
+    vmImage: $[ variables['hostImage'] ]
+  steps:
+    - bash: scripts/ci/azure/macos-setup.sh
+      name: Setup
+    - bash: scripts/ci/azure/run.sh update
+      name: Update
+    - bash: scripts/ci/azure/run.sh configure
+      name: Configure
+    - bash: scripts/ci/azure/run.sh build
+      name: Build
+    - bash: scripts/ci/azure/run.sh test
+      name: Test
 
 - job: linux
   timeoutInMinutes: 90
diff --git a/scripts/ci/azure/macos-setup.sh b/scripts/ci/azure/macos-setup.sh
index b98f781a0d..325cd920cb 100755
--- a/scripts/ci/azure/macos-setup.sh
+++ b/scripts/ci/azure/macos-setup.sh
@@ -16,14 +16,12 @@ case "$SYSTEM_JOBNAME" in
     ;;
 esac
 
-echo "Installing CMake Nightly"
-curl -L https://cmake.org/files/dev/cmake-3.16.20191218-g8262562-Darwin-x86_64.tar.gz | sudo tar -C /Applications --strip-components=1 -xz
-
-echo "Removing all existing brew packages"
+echo "Removing all existing brew package and update teh formule"
 brew remove --force $(brew list)
+brew update
 
-echo "Installing Kitware Ninja"
-brew install ninja
+echo "Installing Kitware CMake and Ninja"
+brew install cmake ninja
 
 echo "Installing GCC"
 brew install gcc
@@ -31,6 +29,9 @@ brew install gcc
 echo "Installing blosc compression"
 brew install c-blosc
 
+echo "Installing python and friends"
+brew install python numpy
+
 if [[ "$SYSTEM_JOBNAME" =~ .*openmpi.* ]]
 then
   echo "Installing OpenMPI"
diff --git a/scripts/ci/azure/run.sh b/scripts/ci/azure/run.sh
index c8a7ce6608..81eff1f72b 100755
--- a/scripts/ci/azure/run.sh
+++ b/scripts/ci/azure/run.sh
@@ -66,6 +66,9 @@ then
   export OMPI_MCA_hwloc_base_binding_policy=none
 fi
 
+# Make sure staging tests use localhost
+export ADIOS2_IP=127.0.0.1
+
 echo "**********Env Begin**********"
 env | sort
 echo "**********Env End************"
diff --git a/scripts/ci/gh-actions/run.sh b/scripts/ci/gh-actions/run.sh
index aa40a9b3ec..c71f2be119 100755
--- a/scripts/ci/gh-actions/run.sh
+++ b/scripts/ci/gh-actions/run.sh
@@ -75,6 +75,8 @@ then
   export OMPI_MCA_opal_warn_on_missing_libcuda=0
 fi
 
+# Make sure staging tests use localhost
+export ADIOS2_IP=127.0.0.1
 
 echo "**********Env Begin**********"
 env | sort
diff --git a/testing/adios2/engine/staging-common/TestSupp.cmake b/testing/adios2/engine/staging-common/TestSupp.cmake
index 20628fcdb2..9c18a44684 100644
--- a/testing/adios2/engine/staging-common/TestSupp.cmake
+++ b/testing/adios2/engine/staging-common/TestSupp.cmake
@@ -251,7 +251,10 @@ function(add_common_test basename engine)
        set (timeout "30")
     endif()
 
-    set_tests_properties(${testname} PROPERTIES TIMEOUT ${timeout} ${${basename}_PROPERTIES} )
+    set_tests_properties(${testname} PROPERTIES
+        TIMEOUT ${timeout} ${${basename}_PROPERTIES}
+        RUN_SERIAL TRUE
+    )
 endfunction()
 
 function(from_hex HEX DEC)