diff --git a/modules/packages/LockFreeQueue.chpl b/modules/packages/LockFreeQueue.chpl
index 6cb501faed66..7e80afa11fad 100644
--- a/modules/packages/LockFreeQueue.chpl
+++ b/modules/packages/LockFreeQueue.chpl
@@ -27,13 +27,9 @@
 
       - It relies on Chapel ``extern`` code blocks and so requires that
         the Chapel compiler is built with LLVM enabled.
-      - Currently only ``CHPL_TARGET_ARCH=x86_64`` is supported as it uses
-        the x86-64 instruction: CMPXCHG16B_.
-      - The implementation relies on ``GCC`` style inline assembly, and so
-        is restricted to a ``CHPL_TARGET_COMPILER`` value of ``gnu``,
-        ``clang``, or ``llvm``.
-
-    .. _CMPXCHG16B: https://www.felixcloutier.com/x86/cmpxchg8b:cmpxchg16b
+      - The implementation relies on using either ``GCC`` style inline assembly
+        (for x86-64) or a GCC/clang builtin, and so is restricted to a
+        ``CHPL_TARGET_COMPILER`` value of ``gnu``, ``clang``, or ``llvm``.
 
   An implementation of the Michael & Scott [#]_, a lock-free queue. Concurrent safe
   memory reclamation is handled by an internal :record:`EpochManager`. Usage of the
diff --git a/modules/packages/LockFreeStack.chpl b/modules/packages/LockFreeStack.chpl
index 44973953c799..c526f1251c4f 100644
--- a/modules/packages/LockFreeStack.chpl
+++ b/modules/packages/LockFreeStack.chpl
@@ -28,13 +28,9 @@
 
       - It relies on Chapel ``extern`` code blocks and so requires that
         the Chapel compiler is built with LLVM enabled.
-      - Currently only ``CHPL_TARGET_ARCH=x86_64`` is supported as it uses
-        the x86-64 instruction: CMPXCHG16B_.
-      - The implementation relies on ``GCC`` style inline assembly, and so
-        is restricted to a ``CHPL_TARGET_COMPILER`` value of ``gnu``,
-        ``clang``, or ``llvm``.
-
-    .. _CMPXCHG16B: https://www.felixcloutier.com/x86/cmpxchg8b:cmpxchg16b
+      - The implementation relies on using either ``GCC`` style inline assembly
+        (for x86-64) or a GCC/clang builtin, and so is restricted to a
+        ``CHPL_TARGET_COMPILER`` value of ``gnu``, ``clang``, or ``llvm``.
 
   An implementation of the Treiber Stack [#]_, a lock-free stack. Concurrent safe
   memory reclamation is handled by an internal :record:`EpochManager`. Usage of the
diff --git a/test/library/packages/LockFreeQueue/consistencyCheck.future b/test/library/packages/LockFreeQueue/consistencyCheck.future
deleted file mode 100644
index 8c8863fbae7a..000000000000
--- a/test/library/packages/LockFreeQueue/consistencyCheck.future
+++ /dev/null
@@ -1 +0,0 @@
-bug: this test leaks memory
diff --git a/test/library/packages/LockFreeQueue/interleavedTest.future b/test/library/packages/LockFreeQueue/interleavedTest.future
deleted file mode 100644
index 8c8863fbae7a..000000000000
--- a/test/library/packages/LockFreeQueue/interleavedTest.future
+++ /dev/null
@@ -1 +0,0 @@
-bug: this test leaks memory
diff --git a/test/library/packages/LockFreeQueue/EXECOPTS b/test/library/packages/LockFreeQueue/memLeaks/EXECOPTS
similarity index 100%
rename from test/library/packages/LockFreeQueue/EXECOPTS
rename to test/library/packages/LockFreeQueue/memLeaks/EXECOPTS
diff --git a/test/library/packages/LockFreeQueue/PREDIFF b/test/library/packages/LockFreeQueue/memLeaks/PREDIFF
similarity index 100%
rename from test/library/packages/LockFreeQueue/PREDIFF
rename to test/library/packages/LockFreeQueue/memLeaks/PREDIFF
diff --git a/test/library/packages/LockFreeStack/consistencyCheck.future b/test/library/packages/LockFreeStack/consistencyCheck.future
deleted file mode 100644
index 8c8863fbae7a..000000000000
--- a/test/library/packages/LockFreeStack/consistencyCheck.future
+++ /dev/null
@@ -1 +0,0 @@
-bug: this test leaks memory
diff --git a/test/library/packages/LockFreeStack/interleavedTest.future b/test/library/packages/LockFreeStack/interleavedTest.future
deleted file mode 100644
index 8c8863fbae7a..000000000000
--- a/test/library/packages/LockFreeStack/interleavedTest.future
+++ /dev/null
@@ -1 +0,0 @@
-bug: this test leaks memory
diff --git a/test/library/packages/LockFreeStack/EXECOPTS b/test/library/packages/LockFreeStack/memLeaks/EXECOPTS
similarity index 100%
rename from test/library/packages/LockFreeStack/EXECOPTS
rename to test/library/packages/LockFreeStack/memLeaks/EXECOPTS
diff --git a/test/library/packages/LockFreeStack/PREDIFF b/test/library/packages/LockFreeStack/memLeaks/PREDIFF
similarity index 100%
rename from test/library/packages/LockFreeStack/PREDIFF
rename to test/library/packages/LockFreeStack/memLeaks/PREDIFF