diff --git a/UnitTests/Makefile.unittests b/UnitTests/Makefile.unittests
index e70e43998c..9841d967ad 100755
--- a/UnitTests/Makefile.unittests
+++ b/UnitTests/Makefile.unittests
@@ -358,7 +358,7 @@ SHELL_COMMON = \
                @top_srcdir@/js/common/tests/shell-collection.js \
                @top_srcdir@/js/common/tests/shell-collection-volatile.js \
                @top_srcdir@/js/common/tests/shell-crypto.js \
-               @top_srcdir@/js/common/tests/shell-database.js \
+               @top_srcdir@/js/common/tests/shell-noncluster-database.js \
                @top_srcdir@/js/common/tests/shell-document.js \
                @top_srcdir@/js/common/tests/shell-download.js \
                @top_srcdir@/js/common/tests/shell-edge.js \
@@ -387,8 +387,8 @@ SHELL_COMMON = \
 
 SHELL_SERVER_ONLY = \
                @top_srcdir@/js/server/tests/shell-sharding-helpers.js \
-               @top_srcdir@/js/server/tests/shell-compaction.js \
-               @top_srcdir@/js/server/tests/shell-transactions.js \
+               @top_srcdir@/js/server/tests/shell-noncluster-compaction.js \
+               @top_srcdir@/js/server/tests/shell-noncluster-transactions.js \
                @top_srcdir@/js/server/tests/shell-routing.js \
                @top_srcdir@/js/server/tests/shell-any.js \
                @top_srcdir@/js/server/tests/shell-bitarray-index.js \
diff --git a/js/server/tests/shell-compaction.js b/js/server/tests/shell-noncluster-compaction.js
similarity index 100%
rename from js/server/tests/shell-compaction.js
rename to js/server/tests/shell-noncluster-compaction.js
diff --git a/js/server/tests/shell-transactions.js b/js/server/tests/shell-noncluster-transactions.js
similarity index 100%
rename from js/server/tests/shell-transactions.js
rename to js/server/tests/shell-noncluster-transactions.js