diff --git a/test/studies/shootout/submitted/Compat.chpl b/test/studies/shootout/submitted/Compat.chpl
index ed910baab132..3222c786ba2a 100644
--- a/test/studies/shootout/submitted/Compat.chpl
+++ b/test/studies/shootout/submitted/Compat.chpl
@@ -1,21 +1,6 @@
-use IO, BigInteger, Regex;
+use IO;
 
 @deprecated("openfd is deprecated, please use the file initializer with a 'c_int' argument instead")
 proc openfd(x) {
   return new file(x);
 }
-
-@deprecated("bigint.div_q using Round is deprecated, use the standalone function div with roundingMode instead")
-proc ref bigint.div_q(x, y) {
-  div(this, x, y);
-}
-
-@deprecated("'Regex.compile' is deprecated. Please use 'new regex()' instead.")
-proc compile(x) {
-  return new regex(x);
-}
-
-@deprecated("regex.sub is deprecated. Please use string.replace.")
-proc regex.sub(x, y) {
-  return y.replace(this, x);
-}
\ No newline at end of file
diff --git a/test/studies/shootout/submitted/CompatGMP.chpl b/test/studies/shootout/submitted/CompatGMP.chpl
new file mode 100644
index 000000000000..a41a19b05864
--- /dev/null
+++ b/test/studies/shootout/submitted/CompatGMP.chpl
@@ -0,0 +1,6 @@
+use BigInteger;
+
+@deprecated("bigint.div_q using Round is deprecated, use the standalone function div with roundingMode instead")
+proc ref bigint.div_q(x, y) {
+  div(this, x, y);
+}
diff --git a/test/studies/shootout/submitted/CompatGMP.notest b/test/studies/shootout/submitted/CompatGMP.notest
new file mode 100644
index 000000000000..1d35f87634ff
--- /dev/null
+++ b/test/studies/shootout/submitted/CompatGMP.notest
@@ -0,0 +1 @@
+Compatability shim
diff --git a/test/studies/shootout/submitted/CompatRE2.chpl b/test/studies/shootout/submitted/CompatRE2.chpl
new file mode 100644
index 000000000000..67f6bbf50d01
--- /dev/null
+++ b/test/studies/shootout/submitted/CompatRE2.chpl
@@ -0,0 +1,11 @@
+use Regex;
+
+@deprecated("'Regex.compile' is deprecated. Please use 'new regex()' instead.")
+proc compile(x) {
+  return new regex(x);
+}
+
+@deprecated("regex.sub is deprecated. Please use string.replace.")
+proc regex.sub(x, y) {
+  return y.replace(this, x);
+}
\ No newline at end of file
diff --git a/test/studies/shootout/submitted/CompatRE2.notest b/test/studies/shootout/submitted/CompatRE2.notest
new file mode 100644
index 000000000000..1d35f87634ff
--- /dev/null
+++ b/test/studies/shootout/submitted/CompatRE2.notest
@@ -0,0 +1 @@
+Compatability shim
diff --git a/test/studies/shootout/submitted/pidigits2.chpl b/test/studies/shootout/submitted/pidigits2.chpl
index c5e43a7cb820..bcb6ee4098a4 100644
--- a/test/studies/shootout/submitted/pidigits2.chpl
+++ b/test/studies/shootout/submitted/pidigits2.chpl
@@ -68,4 +68,4 @@ iter genDigits(numDigits) {
     numer *= 10;
   }
 }
-use Compat;
+use Compat, CompatGMP;
diff --git a/test/studies/shootout/submitted/regexredux2.chpl b/test/studies/shootout/submitted/regexredux2.chpl
index babe6b41e41e..c1ddbf820e92 100644
--- a/test/studies/shootout/submitted/regexredux2.chpl
+++ b/test/studies/shootout/submitted/regexredux2.chpl
@@ -58,4 +58,4 @@ proc main(args: [] string) {
   writeln(data.size);
   writeln(copy.size);
 }
-use Compat;
+use Compat, CompatRE2;
diff --git a/test/studies/shootout/submitted/regexredux3.chpl b/test/studies/shootout/submitted/regexredux3.chpl
index 49194a5a1e58..474db18269db 100644
--- a/test/studies/shootout/submitted/regexredux3.chpl
+++ b/test/studies/shootout/submitted/regexredux3.chpl
@@ -59,4 +59,4 @@ proc main(args: [] string) {
   writeln(data.size);
   writeln(copy.size);
 }
-use Compat;
+use Compat, CompatRE2;