diff --git a/.gitmodules b/.gitmodules
index e69de29b..9e3dc2f8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "modules/tests-sos"]
+	path = modules/tests-sos
+	url = git@github.com:openshmem-org/tests-sos.git
+	branch = main
diff --git a/autogen.sh b/autogen.sh
index e05079b1..699a6845 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,7 +2,7 @@
 
 test -d ./config || mkdir ./config
 
-test -f modules/tests-sos/configure.ac || { echo "ERROR: The test directory is empty. Please run the following command to install the SOS tests:"; echo "git submodule update --init"; exit 1; }
+test -f modules/tests-sos/configure.ac || { echo "ERROR: The test directory is empty. Please run the following command to download the SOS tests:"; echo "git submodule update --init"; exit 1; }
 
 FILES=./man/*.1
 echo -n "dist_man1_MANS =" > ./man/Makefile.am
diff --git a/modules/tests-sos b/modules/tests-sos
new file mode 160000
index 00000000..d52b3fbd
--- /dev/null
+++ b/modules/tests-sos
@@ -0,0 +1 @@
+Subproject commit d52b3fbd51675ff98dd9b15d9b104a85d9e5e604