diff --git a/.gitattributes b/.gitattributes
index a2fe2468a465ef9023167698513cc7c9e49348ba..1e753234e1bfaeb29f3f66e6d0b90f35b3e5b511 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5566,6 +5566,7 @@ SubSystems/Online_Cobalt/validation/system/gpu/persistence-mode.test eol=lf
 SubSystems/Online_Cobalt/validation/system/hardware/sata-ahci.test eol=lf
 SubSystems/Online_Cobalt/validation/system/mpi/basic-mpi.test eol=lf
 SubSystems/Online_Cobalt/validation/system/mpi/custom-openmpi-config.test eol=lf
+SubSystems/Online_Cobalt/validation/system/mpi/mpi-selector.test -text
 SubSystems/Online_Cobalt/validation/system/network/10gb-ifaces.test -text
 SubSystems/Online_Cobalt/validation/system/network/hosts.test eol=lf
 SubSystems/Online_Cobalt/validation/system/network/ipoib.test -text
diff --git a/SubSystems/Online_Cobalt/validation/system/mpi/basic-mpi.test b/SubSystems/Online_Cobalt/validation/system/mpi/basic-mpi.test
index 0c013f7521cce7bc237ddfed7e375fe6d3e43a6e..707622e916f06336ca5ad6fb0575a66bc24e0358 100755
--- a/SubSystems/Online_Cobalt/validation/system/mpi/basic-mpi.test
+++ b/SubSystems/Online_Cobalt/validation/system/mpi/basic-mpi.test
@@ -1,5 +1,8 @@
 #!/bin/bash -ve
 
+source ../../validation_utils.sh
+check_running_on_cobalt2
+
 /opt/openmpi/bin/mpicc mpi-hello-world.c -o mpi-hello-world
 /opt/openmpi/bin/mpirun --tag-output -H localhost,localhost ./mpi-hello-world | sort | fgrep 'Hello world' | wc -l | grep '^2$'
 
diff --git a/SubSystems/Online_Cobalt/validation/system/mpi/mpi-selector.test b/SubSystems/Online_Cobalt/validation/system/mpi/mpi-selector.test
new file mode 100755
index 0000000000000000000000000000000000000000..3a8ea39e9261805d08b6626cb345236348e67332
--- /dev/null
+++ b/SubSystems/Online_Cobalt/validation/system/mpi/mpi-selector.test
@@ -0,0 +1,10 @@
+#!/bin/bash -ve
+
+#example output of mpi-selector
+#$ mpi-selector --query
+#default:openmpi-4.0.0rc5
+#level:system
+
+mpi-selector --query | egrep "default|level:system" | wc -l | grep '^2$'
+
+exit 0