diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
index 9a61403264c..f085bb5a036 100644
--- a/.github/CHANGELOG.md
+++ b/.github/CHANGELOG.md
@@ -47,6 +47,9 @@
 
 <h3>Bug fixes</h3>
 
+* The device suite tests can now execute successfully if no shots configuration variable is given.
+  [(#1641)](https://github.com/PennyLaneAI/pennylane/pull/1641)
+
 <h3>Documentation</h3>
 
 <h3>Contributors</h3>
diff --git a/pennylane/devices/tests/test_measurements.py b/pennylane/devices/tests/test_measurements.py
index 04255115457..a2744794b9f 100755
--- a/pennylane/devices/tests/test_measurements.py
+++ b/pennylane/devices/tests/test_measurements.py
@@ -66,7 +66,7 @@ def test_supported_observables_can_be_implemented(self, device_kwargs, observabl
         device_kwargs["wires"] = 3
         dev = qml.device(**device_kwargs)
 
-        if device_kwargs["shots"] is not None and observable == "SparseHamiltonian":
+        if device_kwargs.get("shots", None) is not None and observable == "SparseHamiltonian":
             pytest.skip("SparseHamiltonian only supported in analytic mode")
 
         assert hasattr(dev, "observables")