diff --git a/modules/packages/OrderedMap.chpl b/modules/packages/OrderedMap.chpl
deleted file mode 100644
index 29831a6916b8..000000000000
--- a/modules/packages/OrderedMap.chpl
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2020-2023 Hewlett Packard Enterprise Development LP
- * Other additional copyright holders may be indicated within.
- *
- * The entirety of this work is licensed under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- *
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@deprecated(notes="The OrderedMap module and the orderedMap type are deprecated in favor of SortedMap and sortedMap")
-module OrderedMap {
-  public use SortedMap;
-
-  type orderedMap = sortedMap;
-}
diff --git a/modules/packages/OrderedSet.chpl b/modules/packages/OrderedSet.chpl
deleted file mode 100644
index 47648b627498..000000000000
--- a/modules/packages/OrderedSet.chpl
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2020-2023 Hewlett Packard Enterprise Development LP
- * Other additional copyright holders may be indicated within.
- *
- * The entirety of this work is licensed under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- *
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@deprecated(notes="The OrderedSet module and the orderedSet type are deprecated in favor of SortedSet and sortedMap")
-module OrderedSet {
-  public use SortedSet;
-
-  type orderedSet = sortedSet;
-}
diff --git a/modules/packages/UnrolledLinkedList.chpl b/modules/packages/UnrolledLinkedList.chpl
index 6ec2e2577227..877948a78cc1 100644
--- a/modules/packages/UnrolledLinkedList.chpl
+++ b/modules/packages/UnrolledLinkedList.chpl
@@ -610,26 +610,6 @@ module UnrolledLinkedList {
       return result;
     }
 
-    @deprecated(notes="unrolledLinkedList.extend is deprecated, please use unrolledLinkedList.append")
-    proc ref extend(other: list(eltType, ?p)) lifetime this < other {
-      append(other);
-    }
-
-    @deprecated(notes="unrolledLinkedList.extend is deprecated, please use unrolledLinkedList.append")
-    proc ref extend(other: unrolledLinkedList(eltType, ?p)) lifetime this < other {
-      append(other);
-    }
-
-    @deprecated(notes="unrolledLinkedList.extend is deprecated, please use unrolledLinkedList.append")
-    proc ref extend(other: [?d] eltType) lifetime this < other {
-      append(other);
-    }
-
-    @deprecated(notes="unrolledLinkedList.extend is deprecated, please use unrolledLinkedList.append")
-    proc ref extend(other: range(eltType, ?b, ?d)) lifetime this < other {
-      append(other);
-    }
-
     @chpldoc.nodoc
     proc ref _insert(idx: int, in x: eltType)
          lifetime this < x {
diff --git a/modules/standard/List.chpl b/modules/standard/List.chpl
index da474b62ea98..d7495561c77b 100644
--- a/modules/standard/List.chpl
+++ b/modules/standard/List.chpl
@@ -1036,21 +1036,6 @@ module List {
       return result;
     }
 
-    @deprecated(notes="list.extend is deprecated, please use list.append")
-    proc ref extend(other: list(eltType, ?p)) lifetime this < other {
-      pushBack(other);
-    }
-
-    @deprecated(notes="list.extend is deprecated, please use list.append")
-    proc ref extend(other: [?d] eltType) lifetime this < other {
-      pushBack(other);
-    }
-
-    @deprecated(notes="list.extend is deprecated, please use list.append")
-    proc ref extend(other: range(eltType, ?b, ?d)) lifetime this < other {
-      pushBack(other);
-    }
-
     /*
       Insert an element at a given position in this list, shifting all elements
       currently at and following that index one to the right. The call
diff --git a/modules/standard/Regex.chpl b/modules/standard/Regex.chpl
index c113aca850de..91df67b0aa7e 100644
--- a/modules/standard/Regex.chpl
+++ b/modules/standard/Regex.chpl
@@ -412,63 +412,6 @@ class BadRegexError : Error {
   }
 }
 
-/*
-   Compile a regular expression. This routine will throw a
-   class:`BadRegexError` if compilation failed.
-
-   .. warning::
-
-     This procedure is deprecated. Please use :proc:`regex.init` via ``new
-     regex()``.
-
-
-   :arg pattern: the regular expression to compile. This argument can be string
-                 or bytes. See :ref:`regular-expression-syntax` for details.
-                 Note that you may have to escape backslashes. For example, to
-                 get the regular expression ``\s``, you'd have to write
-                 ``"\\s"`` because the ``\`` is the escape character within
-                 Chapel string/bytes literals. Note that, Chapel supports
-                 triple-quoted raw string/bytes literals, which do not require
-                 escaping backslashes. For example ``"""\s"""`` or ``b"""\s"""``
-                 can be used.
-   :arg posix: (optional) set to true to disable non-POSIX regular expression
-               syntax
-   :arg literal: (optional) set to true to treat the regular expression as a
-                 literal (ie, create a regex matching ``pattern`` as a string
-                 rather than as a regular expression).
-   :arg noCapture: (optional) set to true in order to disable all capture groups
-                   in the regular expression
-   :arg ignoreCase: (optional) set to true in order to ignore case when
-                    matching. Note that this can be set inside the regular
-                    expression with ``(?i)``.
-   :arg multiLine: (optional) set to true in order to activate multiline mode
-                   (meaning that ``^`` and ``$`` match the beginning and end
-                   of a line instead of just the beginning and end of the text.
-                   Note that this can be set inside a regular expression
-                   with ``(?m)``.
-   :arg dotAll: (optional) set to true in order to allow ``.``
-               to match a newline. Note that this can be set inside the
-               regular expression with ``(?s)``.
-   :arg nonGreedy: (optional) set to true in order to prefer shorter matches for
-                   repetitions; for example, normally x* will match as many x
-                   characters as possible and x*? will match as few as possible.
-                   This flag swaps the two, so that x* will match as few as
-                   possible and x*? will match as many as possible. Note that
-                   this flag can be set inside the regular expression with
-                   ``(?U)``.
-
-   :throws BadRegexError: If the argument 'pattern' has syntactical errors.
-                          Refer to https://github.com/google/re2/blob/master/re2/re2.h
-                          for more details about error codes.
- */
-@deprecated(notes="'Regex.compile' is deprecated. Please use 'new regex()' instead.")
-proc compile(pattern: ?t, posix=false, literal=false, noCapture=false,
-             /*i*/ ignoreCase=false, /*m*/ multiLine=false, /*s*/ dotAll=false,
-             /*U*/ nonGreedy=false): regex(t) throws where t==string || t==bytes {
-  return new regex(pattern, posix, literal, noCapture, ignoreCase, multiLine,
-                   dotAll, nonGreedy);
-}
-
 /*  The regexMatch record records a regular expression search match
     or a capture group.
 
@@ -557,7 +500,6 @@ record chpl_serializeHelper {
 
 /*  This record represents a compiled regular expression. Regular expressions
     are currently cached on a per-thread basis and are reference counted.
-    To create a compiled regular expression, use the proc:`compile` function.
 
     A string-based regex can be cast to a string (resulting in the pattern that
     was compiled). A string can be cast to a string-based regex (resulting in a
@@ -999,61 +941,6 @@ record regex : serializable {
     }
   }
 
-  pragma "last resort"
-  @deprecated(notes="regex.matches arguments 'captures' and 'maxmatches' are deprecated. Use 'numCaptures' and/or 'maxMatches instead.")
-  iter matches(text: exprType, param captures=0, maxmatches: int = max(int))
-  {
-    for m in matches(text, numCaptures=captures, maxMatches=maxmatches) {
-      yield m;
-    }
-  }
-
-  /* Perform the same operation as :proc:`regex.sub` but return a tuple
-     containing the new text and the number of substitutions made.
-
-     .. warning::
-
-       This method is deprecated. Please use :proc:`string.replaceAndCount`.
-
-     :arg repl: replace matches with this string or bytes
-     :arg text: the text to search and replace within
-     :type text: `string` or `bytes`
-     :arg global: if true, replace multiple matches
-     :returns: a tuple containing (new text, number of substitutions made)
-   */
-  @deprecated(notes="regex.subn is deprecated. Please use string.replaceAndCount.")
-  proc subn(repl: exprType, text: exprType, global = true ):(exprType, int)
-  {
-    if global then
-      return text.replaceAndCount(this, repl);
-    else
-      return text.replaceAndCount(this, repl, 1);
-  }
-
-  /*
-     Find matches to this regular expression and create a new string or bytes in
-     which those matches are replaced by repl.
-
-     .. warning::
-
-       This method is deprecated. Please use :proc:`string.replace` with `regex`
-       argument.
-
-     :arg repl: replace matches with this string or bytes
-     :arg text: the text to search and replace within
-     :type text: `string` or `bytes`
-     :arg global: if true, replace multiple matches
-     :returns: the new string or bytes
-   */
-  @deprecated(notes="regex.sub is deprecated. Please use string.replace.")
-  proc sub(repl: exprType, text: exprType, global = true )
-  {
-    if global then
-      return text.replace(this, repl);
-    else
-      return text.replace(this, repl, count=1);
-  }
-
   // TODO this could use _serialize to get the pattern and options
   @chpldoc.nodoc
   proc writeThis(f) throws {
diff --git a/test/deprecated/listExtend.chpl b/test/deprecated/listExtend.chpl
deleted file mode 100644
index 312893b3658d..000000000000
--- a/test/deprecated/listExtend.chpl
+++ /dev/null
@@ -1,16 +0,0 @@
-use List;
-
-config const n = 3;
-
-var theList = new list(int);
-
-var r = 1..n;
-var a: [r] int;
-var otherList = new list(int);
-for i in r do otherList.pushBack(i);
-
-theList.extend(r);
-theList.extend(a);
-theList.extend(otherList);
-
-writeln(theList);
diff --git a/test/deprecated/listExtend.good b/test/deprecated/listExtend.good
deleted file mode 100644
index d0137e11f25d..000000000000
--- a/test/deprecated/listExtend.good
+++ /dev/null
@@ -1,4 +0,0 @@
-listExtend.chpl:12: warning: list.extend is deprecated, please use list.append
-listExtend.chpl:13: warning: list.extend is deprecated, please use list.append
-listExtend.chpl:14: warning: list.extend is deprecated, please use list.append
-[1, 2, 3, 0, 0, 0, 1, 2, 3]
diff --git a/test/deprecated/oMap.chpl b/test/deprecated/oMap.chpl
deleted file mode 100644
index 49f0b3e52a6f..000000000000
--- a/test/deprecated/oMap.chpl
+++ /dev/null
@@ -1,7 +0,0 @@
-use OrderedMap;
-
-var omap = new orderedMap(int, int);
-
-omap[5] = 10;
-
-writeln(omap);
diff --git a/test/deprecated/oMap.good b/test/deprecated/oMap.good
deleted file mode 100644
index 06187dbdff38..000000000000
--- a/test/deprecated/oMap.good
+++ /dev/null
@@ -1,2 +0,0 @@
-oMap.chpl:1: warning: The OrderedMap module and the orderedMap type are deprecated in favor of SortedMap and sortedMap
-{5: 10}
diff --git a/test/deprecated/oSet.chpl b/test/deprecated/oSet.chpl
deleted file mode 100644
index 5d748091ea1e..000000000000
--- a/test/deprecated/oSet.chpl
+++ /dev/null
@@ -1,8 +0,0 @@
-use OrderedSet;
-
-var oset = new orderedSet(int);
-
-oset.add(5);
-oset.add(5);
-
-writeln(oset.size);
diff --git a/test/deprecated/oSet.good b/test/deprecated/oSet.good
deleted file mode 100644
index f677331471c1..000000000000
--- a/test/deprecated/oSet.good
+++ /dev/null
@@ -1,2 +0,0 @@
-oSet.chpl:1: warning: The OrderedSet module and the orderedSet type are deprecated in favor of SortedSet and sortedMap
-1
diff --git a/test/deprecated/regexCompile.chpl b/test/deprecated/regexCompile.chpl
deleted file mode 100644
index 1bb445b9bd4d..000000000000
--- a/test/deprecated/regexCompile.chpl
+++ /dev/null
@@ -1,5 +0,0 @@
-use Regex;
-
-var r = compile("a+");
-
-writeln(r.match("aabb"));
diff --git a/test/deprecated/regexCompile.good b/test/deprecated/regexCompile.good
deleted file mode 100644
index 77ead0536d0e..000000000000
--- a/test/deprecated/regexCompile.good
+++ /dev/null
@@ -1,2 +0,0 @@
-regexCompile.chpl:3: warning: 'Regex.compile' is deprecated. Please use 'new regex()' instead.
-(matched = true, byteOffset = 0, numBytes = 2)
diff --git a/test/deprecated/regexCompile.skipif b/test/deprecated/regexCompile.skipif
deleted file mode 100644
index ae2280573298..000000000000
--- a/test/deprecated/regexCompile.skipif
+++ /dev/null
@@ -1 +0,0 @@
-CHPL_RE2==none
diff --git a/test/deprecated/regexMatchesArgs.chpl b/test/deprecated/regexMatchesArgs.chpl
deleted file mode 100644
index d82a20aec3e0..000000000000
--- a/test/deprecated/regexMatchesArgs.chpl
+++ /dev/null
@@ -1,9 +0,0 @@
-use Regex;
-
-var text = "foo 123 bar 345";
-
-var r = new regex("\\d+");
-
-for m in r.matches(text, captures=0, maxmatches=1) {
-  writeln(m);
-}
diff --git a/test/deprecated/regexMatchesArgs.good b/test/deprecated/regexMatchesArgs.good
deleted file mode 100644
index 6c168ae30abe..000000000000
--- a/test/deprecated/regexMatchesArgs.good
+++ /dev/null
@@ -1,2 +0,0 @@
-regexMatchesArgs.chpl:7: warning: regex.matches arguments 'captures' and 'maxmatches' are deprecated. Use 'numCaptures' and/or 'maxMatches instead.
-((matched = true, byteOffset = 4, numBytes = 3),)
diff --git a/test/deprecated/regexMatchesArgs.skipif b/test/deprecated/regexMatchesArgs.skipif
deleted file mode 100644
index ae2280573298..000000000000
--- a/test/deprecated/regexMatchesArgs.skipif
+++ /dev/null
@@ -1 +0,0 @@
-CHPL_RE2==none
diff --git a/test/deprecated/regexSubSubn.chpl b/test/deprecated/regexSubSubn.chpl
deleted file mode 100644
index b1b8ba351fe5..000000000000
--- a/test/deprecated/regexSubSubn.chpl
+++ /dev/null
@@ -1,7 +0,0 @@
-use Regex;
-
-var myStr = "AABBCC";
-var r = new regex("A.*B");
-
-writeln(r.sub(myStr, "x"));
-writeln(r.subn(myStr, "x"));
diff --git a/test/deprecated/regexSubSubn.good b/test/deprecated/regexSubSubn.good
deleted file mode 100644
index 7be42567d1f0..000000000000
--- a/test/deprecated/regexSubSubn.good
+++ /dev/null
@@ -1,4 +0,0 @@
-regexSubSubn.chpl:6: warning: regex.sub is deprecated. Please use string.replace.
-regexSubSubn.chpl:7: warning: regex.subn is deprecated. Please use string.replaceAndCount.
-x
-(x, 0)
diff --git a/test/deprecated/regexSubSubn.skipif b/test/deprecated/regexSubSubn.skipif
deleted file mode 100644
index ae2280573298..000000000000
--- a/test/deprecated/regexSubSubn.skipif
+++ /dev/null
@@ -1 +0,0 @@
-CHPL_RE2==none
diff --git a/test/deprecated/unrolledLinkedListExtend.chpl b/test/deprecated/unrolledLinkedListExtend.chpl
deleted file mode 100644
index da05a14cc767..000000000000
--- a/test/deprecated/unrolledLinkedListExtend.chpl
+++ /dev/null
@@ -1,16 +0,0 @@
-use UnrolledLinkedList;
-
-config const n = 3;
-
-var theList = new unrolledLinkedList(int);
-
-var r = 1..n;
-var a: [r] int;
-var otherList = new unrolledLinkedList(int);
-for i in r do otherList.append(i);
-
-theList.extend(r);
-theList.extend(a);
-theList.extend(otherList);
-
-writeln(theList);
diff --git a/test/deprecated/unrolledLinkedListExtend.good b/test/deprecated/unrolledLinkedListExtend.good
deleted file mode 100644
index f4bbe98e4df2..000000000000
--- a/test/deprecated/unrolledLinkedListExtend.good
+++ /dev/null
@@ -1,4 +0,0 @@
-unrolledLinkedListExtend.chpl:12: warning: unrolledLinkedList.extend is deprecated, please use unrolledLinkedList.append
-unrolledLinkedListExtend.chpl:13: warning: unrolledLinkedList.extend is deprecated, please use unrolledLinkedList.append
-unrolledLinkedListExtend.chpl:14: warning: unrolledLinkedList.extend is deprecated, please use unrolledLinkedList.append
-[1, 2, 3, 0, 0, 0, 1, 2, 3]
diff --git a/test/studies/shootout/submitted/regexredux2.notest b/test/studies/shootout/submitted/regexredux2.notest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/test/studies/shootout/submitted/regexredux3.notest b/test/studies/shootout/submitted/regexredux3.notest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/test/unstable/packageModules.chpl b/test/unstable/packageModules.chpl
index 162d0278aecb..69fb3c861b53 100644
--- a/test/unstable/packageModules.chpl
+++ b/test/unstable/packageModules.chpl
@@ -30,8 +30,6 @@ import LockFreeStack;
 import MPI;
 import MatrixMarket;
 import NetCDF;
-import OrderedMap;
-import OrderedSet;
 import PeekPoke;
 import Prefetch;
 import ProtobufProtocolSupport;
diff --git a/test/unstable/packageModules.good b/test/unstable/packageModules.good
index 840ccf4d7e9b..03214b5f854f 100644
--- a/test/unstable/packageModules.good
+++ b/test/unstable/packageModules.good
@@ -1,55 +1,53 @@
-packageModules.chpl:1: warning: AllLocalesBarriers is unstable
-packageModules.chpl:2: warning: ArgumentParser is unstable.
-packageModules.chpl:3: warning: AtomicObjects is unstable
-packageModules.chpl:4: warning: BLAS is unstable
-packageModules.chpl:5: warning: BinaryIO module is deprecated; please use the IO module instead
-packageModules.chpl:6: warning: Buffers is unstable
-packageModules.chpl:7: warning: Channel is unstable
-packageModules.chpl:8: warning: ChplFormat module is considered unstable pending naming changes
-packageModules.chpl:9: warning: Collection is unstable
-packageModules.chpl:10: warning: ConcurrentMap is unstable
-packageModules.chpl:11: warning: CopyAggregation is unstable
-packageModules.chpl:12: warning: Crypto is unstable
-packageModules.chpl:13: warning: Curl is unstable
-packageModules.chpl:14: warning: DistributedBag is unstable
-packageModules.chpl:15: warning: DistributedDeque is unstable
-packageModules.chpl:16: warning: DistributedIters is unstable
-packageModules.chpl:17: warning: EpochManager is unstable
-packageModules.chpl:18: warning: ExplicitRefCount is unstable
-packageModules.chpl:19: warning: FFTW is unstable
-packageModules.chpl:20: warning: FunctionalOperations is unstable
-packageModules.chpl:21: warning: Futures is unstable
-packageModules.chpl:22: warning: HDF5 is unstable
-packageModules.chpl:23: warning: HDFS is unstable
-packageModules.chpl:24: warning: LAPACK is unstable
-packageModules.chpl:25: warning: LinearAlgebra is unstable
-packageModules.chpl:26: warning: LinearAlgebraJama is unstable
-packageModules.chpl:27: warning: LinkedLists is unstable
-packageModules.chpl:28: warning: LockFreeQueue is unstable
-packageModules.chpl:29: warning: LockFreeStack is unstable
-packageModules.chpl:30: warning: MPI is unstable
-packageModules.chpl:31: warning: MatrixMarket is unstable
-packageModules.chpl:32: warning: NetCDF is unstable
-packageModules.chpl:33: warning: The OrderedMap module and the orderedMap type are deprecated in favor of SortedMap and sortedMap
-packageModules.chpl:34: warning: The OrderedSet module and the orderedSet type are deprecated in favor of SortedSet and sortedMap
-packageModules.chpl:35: warning: PeekPoke is unstable
-packageModules.chpl:36: warning: Prefetch is unstable
-packageModules.chpl:37: warning: ProtobufProtocolSupport is unstable
-packageModules.chpl:38: warning: RangeChunk is unstable
-packageModules.chpl:39: warning: RecordParser is unstable
-packageModules.chpl:40: warning: ReplicatedVar is unstable
-packageModules.chpl:41: warning: Search is unstable
-packageModules.chpl:42: warning: Socket is unstable
-packageModules.chpl:43: warning: Sort is unstable
-packageModules.chpl:44: warning: SortedMap is unstable
-packageModules.chpl:45: warning: SortedSet is unstable
-packageModules.chpl:46: warning: TOML is unstable
-packageModules.chpl:47: warning: URL is unstable
-packageModules.chpl:48: warning: UgniPerfStats is unstable
-packageModules.chpl:49: warning: UnitTest is unstable
-packageModules.chpl:50: warning: UnorderedAtomics is unstable
-packageModules.chpl:51: warning: UnorderedCopy is unstable
-packageModules.chpl:52: warning: UnrolledLinkedList is unstable
-packageModules.chpl:53: warning: VisualDebug is unstable
-packageModules.chpl:54: warning: The YAML module is considered unstable pending various name and design changes.
-packageModules.chpl:55: warning: ZMQ is unstable
+packageModules.chpl:XX: warning: AllLocalesBarriers is unstable
+packageModules.chpl:XX: warning: ArgumentParser is unstable.
+packageModules.chpl:XX: warning: AtomicObjects is unstable
+packageModules.chpl:XX: warning: BLAS is unstable
+packageModules.chpl:XX: warning: BinaryIO module is deprecated; please use the IO module instead
+packageModules.chpl:XX: warning: Buffers is unstable
+packageModules.chpl:XX: warning: Channel is unstable
+packageModules.chpl:XX: warning: ChplFormat module is considered unstable pending naming changes
+packageModules.chpl:XX: warning: Collection is unstable
+packageModules.chpl:XX: warning: ConcurrentMap is unstable
+packageModules.chpl:XX: warning: CopyAggregation is unstable
+packageModules.chpl:XX: warning: Crypto is unstable
+packageModules.chpl:XX: warning: Curl is unstable
+packageModules.chpl:XX: warning: DistributedBag is unstable
+packageModules.chpl:XX: warning: DistributedDeque is unstable
+packageModules.chpl:XX: warning: DistributedIters is unstable
+packageModules.chpl:XX: warning: EpochManager is unstable
+packageModules.chpl:XX: warning: ExplicitRefCount is unstable
+packageModules.chpl:XX: warning: FFTW is unstable
+packageModules.chpl:XX: warning: FunctionalOperations is unstable
+packageModules.chpl:XX: warning: Futures is unstable
+packageModules.chpl:XX: warning: HDF5 is unstable
+packageModules.chpl:XX: warning: HDFS is unstable
+packageModules.chpl:XX: warning: LAPACK is unstable
+packageModules.chpl:XX: warning: LinearAlgebra is unstable
+packageModules.chpl:XX: warning: LinearAlgebraJama is unstable
+packageModules.chpl:XX: warning: LinkedLists is unstable
+packageModules.chpl:XX: warning: LockFreeQueue is unstable
+packageModules.chpl:XX: warning: LockFreeStack is unstable
+packageModules.chpl:XX: warning: MPI is unstable
+packageModules.chpl:XX: warning: MatrixMarket is unstable
+packageModules.chpl:XX: warning: NetCDF is unstable
+packageModules.chpl:XX: warning: PeekPoke is unstable
+packageModules.chpl:XX: warning: Prefetch is unstable
+packageModules.chpl:XX: warning: ProtobufProtocolSupport is unstable
+packageModules.chpl:XX: warning: RangeChunk is unstable
+packageModules.chpl:XX: warning: RecordParser is unstable
+packageModules.chpl:XX: warning: ReplicatedVar is unstable
+packageModules.chpl:XX: warning: Search is unstable
+packageModules.chpl:XX: warning: Socket is unstable
+packageModules.chpl:XX: warning: Sort is unstable
+packageModules.chpl:XX: warning: SortedMap is unstable
+packageModules.chpl:XX: warning: SortedSet is unstable
+packageModules.chpl:XX: warning: TOML is unstable
+packageModules.chpl:XX: warning: URL is unstable
+packageModules.chpl:XX: warning: UgniPerfStats is unstable
+packageModules.chpl:XX: warning: UnitTest is unstable
+packageModules.chpl:XX: warning: UnorderedAtomics is unstable
+packageModules.chpl:XX: warning: UnorderedCopy is unstable
+packageModules.chpl:XX: warning: UnrolledLinkedList is unstable
+packageModules.chpl:XX: warning: VisualDebug is unstable
+packageModules.chpl:XX: warning: The YAML module is considered unstable pending various name and design changes.
+packageModules.chpl:XX: warning: ZMQ is unstable
diff --git a/test/unstable/packageModules.prediff b/test/unstable/packageModules.prediff
new file mode 100755
index 000000000000..2b5a6de4a213
--- /dev/null
+++ b/test/unstable/packageModules.prediff
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+sed "s/packageModules.chpl:[[:digit:]]\+:/packageModules.chpl:XX:/" $2 > $2.prediffed
+mv $2.prediffed $2