diff --git a/test/built-ins/Atomics/or/bigint/non-shared-bufferdata.js b/test/built-ins/Atomics/or/bigint/non-shared-bufferdata.js
new file mode 100644
index 0000000000..9510fe0955
--- /dev/null
+++ b/test/built-ins/Atomics/or/bigint/non-shared-bufferdata.js
@@ -0,0 +1,16 @@
+// Copyright (C) 2020 Rick Waldron. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-atomics.or
+description: >
+  Atomics.or will operate on TA when TA.buffer is not a SharedArrayBuffer
+features: [ArrayBuffer, Atomics, BigInt, TypedArray]
+---*/
+
+const i64a = new BigInt64Array(
+  new ArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 4)
+);
+
+assert.sameValue(Atomics.or(i64a, 0, 1n), 0n);
+assert.sameValue(Atomics.load(i64a, 0), 1n);
diff --git a/test/built-ins/Atomics/or/bigint/non-shared-int-views-throws.js b/test/built-ins/Atomics/or/bigint/non-shared-int-views-throws.js
new file mode 100644
index 0000000000..4aa89ec276
--- /dev/null
+++ b/test/built-ins/Atomics/or/bigint/non-shared-int-views-throws.js
@@ -0,0 +1,19 @@
+// Copyright (C) 2020 Rick Waldron. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-atomics.or
+description: >
+  Atomics.or throws when operating on non-sharable integer TypedArrays
+includes: [testBigIntTypedArray.js]
+features: [ArrayBuffer, Atomics, BigInt, TypedArray]
+---*/
+
+const buffer = new ArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 4);
+
+testWithNonShareableBigIntTypedArrayConstructors(function(TA) {
+  const view = new TA(buffer);
+  assert.throws(TypeError, function() {
+    Atomics.or(view, 0, 1n);
+  }, `Atomics.or(new ${TA.name}(buffer), 0, 1n) throws TypeError`);
+});
diff --git a/test/built-ins/Atomics/or/bigint/nonshared-int-views.js b/test/built-ins/Atomics/or/bigint/nonshared-int-views.js
deleted file mode 100644
index 1767ea4358..0000000000
--- a/test/built-ins/Atomics/or/bigint/nonshared-int-views.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (C) 2018 Rick Waldron. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-/*---
-esid: sec-atomics.or
-description: >
-  Test Atomics.or on non-shared integer TypedArrays
-includes: [testBigIntTypedArray.js]
-features: [ArrayBuffer, arrow-function, Atomics, BigInt, TypedArray]
----*/
-const buffer = new ArrayBuffer(BigInt64Array.BYTES_PER_ELEMENT * 2);
-
-testWithBigIntTypedArrayConstructors(function(TA) {
-  assert.throws(TypeError, function() {
-    Atomics.or(new TA(buffer), 0, 0n);
-  }, '`Atomics.or(new TA(buffer), 0, 0n)` throws TypeError');
-});
diff --git a/test/built-ins/Atomics/or/non-shared-bufferdata.js b/test/built-ins/Atomics/or/non-shared-bufferdata.js
new file mode 100644
index 0000000000..bdc8f0fcc6
--- /dev/null
+++ b/test/built-ins/Atomics/or/non-shared-bufferdata.js
@@ -0,0 +1,17 @@
+// Copyright (C) 2020 Rick Waldron. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-atomics.or
+description: >
+  Atomics.or will operate on TA when TA.buffer is not a SharedArrayBuffer
+features: [ArrayBuffer, Atomics, TypedArray]
+---*/
+
+const i32a = new Int32Array(
+  new ArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4)
+);
+
+assert.sameValue(Atomics.or(i32a, 0, 1), 0);
+assert.sameValue(Atomics.load(i32a, 0), 1);
+
diff --git a/test/built-ins/Atomics/or/non-shared-int-views-throws.js b/test/built-ins/Atomics/or/non-shared-int-views-throws.js
new file mode 100644
index 0000000000..2722daeafd
--- /dev/null
+++ b/test/built-ins/Atomics/or/non-shared-int-views-throws.js
@@ -0,0 +1,20 @@
+// Copyright (C) 2020 Rick Waldron. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-atomics.and
+description: >
+  Atomics.and throws when operating on non-sharable integer TypedArrays
+includes: [testTypedArray.js]
+features: [ArrayBuffer, Atomics, TypedArray]
+---*/
+
+const buffer = new ArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4);
+
+testWithNonSharableTypedArrayConstructors(function(TA) {
+  const view = new TA(buffer);
+
+  assert.throws(TypeError, function() {
+    Atomics.and(view, 0, 1);
+  }, `Atomics.and(new ${TA.name}(buffer), 0, 1) throws TypeError`);
+});
diff --git a/test/built-ins/Atomics/or/nonshared-int-views.js b/test/built-ins/Atomics/or/nonshared-int-views.js
deleted file mode 100644
index 13d226697d..0000000000
--- a/test/built-ins/Atomics/or/nonshared-int-views.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (C) 2017 Mozilla Corporation.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-esid: sec-atomics.or
-description: >
-  Test Atomics.or on non-shared integer TypedArrays
-includes: [testTypedArray.js]
-features: [ArrayBuffer, Atomics, TypedArray]
----*/
-
-const buffer = new ArrayBuffer(16);
-const views = intArrayConstructors.slice();
-
-testWithTypedArrayConstructors(function(TA) {
-  assert.throws(TypeError, function() {
-    Atomics.or(new TA(buffer), 0, 0);
-  }, '`Atomics.or(new TA(buffer), 0, 0)` throws TypeError');
-}, views);