diff --git a/test/built-ins/Atomics/store/bigint/non-shared-bufferdata.js b/test/built-ins/Atomics/store/bigint/non-shared-bufferdata.js
new file mode 100644
index 0000000000..6f3e67f129
--- /dev/null
+++ b/test/built-ins/Atomics/store/bigint/non-shared-bufferdata.js
@@ -0,0 +1,15 @@
+// Copyright (C) 2020 Rick Waldron.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-atomics.store
+description: >
+  Atomics.store 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.store(i64a, 0, 1), 1);
diff --git a/test/built-ins/Atomics/store/bigint/non-shared-int-views-throws.js b/test/built-ins/Atomics/store/bigint/non-shared-int-views-throws.js
new file mode 100644
index 0000000000..9b3d195daa
--- /dev/null
+++ b/test/built-ins/Atomics/store/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.store
+description: >
+  Atomics.store 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.store(view, 0, 1);
+  }, `Atomics.store(new ${TA.name}(view), 0, 1) throws TypeError`);
+});
diff --git a/test/built-ins/Atomics/store/bigint/nonshared-int-views.js b/test/built-ins/Atomics/store/bigint/nonshared-int-views.js
deleted file mode 100644
index b89c809533..0000000000
--- a/test/built-ins/Atomics/store/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.store
-description: >
-  Test Atomics.store 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.store(new TA(buffer), 0, 0n);
-  }, '`Atomics.store(new TA(buffer), 0, 0n)` throws TypeError');
-});
diff --git a/test/built-ins/Atomics/store/non-shared-bufferdata.js b/test/built-ins/Atomics/store/non-shared-bufferdata.js
new file mode 100644
index 0000000000..ec891b05a8
--- /dev/null
+++ b/test/built-ins/Atomics/store/non-shared-bufferdata.js
@@ -0,0 +1,15 @@
+// Copyright (C) 2020 Rick Waldron.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-atomics.store
+description: >
+  Atomics.store 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.store(i32a, 0, 1), 1);
diff --git a/test/built-ins/Atomics/store/nonshared-int-views.js b/test/built-ins/Atomics/store/non-shared-views-throws.js
similarity index 60%
rename from test/built-ins/Atomics/store/nonshared-int-views.js
rename to test/built-ins/Atomics/store/non-shared-views-throws.js
index 06541264d8..17ca6106ed 100644
--- a/test/built-ins/Atomics/store/nonshared-int-views.js
+++ b/test/built-ins/Atomics/store/non-shared-views-throws.js
@@ -4,16 +4,16 @@
 /*---
 esid: sec-atomics.store
 description: >
-  Test Atomics.store on non-shared integer TypedArrays
+  Atomics.store throws when operating on non-sharable integer TypedArrays
 includes: [testTypedArray.js]
 features: [ArrayBuffer, Atomics, TypedArray]
 ---*/
 
-const buffer = new ArrayBuffer(16);
+const buffer = new ArrayBuffer(Int32Array.BYTES_PER_ELEMENT * 4);
 const views = intArrayConstructors.slice();
 
-testWithTypedArrayConstructors(function(TA) {
+testWithNonSharableTypedArrayConstructors(function(TA) {
   assert.throws(TypeError, function() {
     Atomics.store(new TA(buffer), 0, 0);
-  }, '`Atomics.store(new TA(buffer), 0, 0)` throws TypeError');
+  }, `Atomics.store(new ${TA.name}(view), 0, 1) throws TypeError`);
 }, views);