diff --git a/checks-superstaq/checks_superstaq/pytest_.py b/checks-superstaq/checks_superstaq/pytest_.py
index 8037c4629..de451dbf5 100644
--- a/checks-superstaq/checks_superstaq/pytest_.py
+++ b/checks-superstaq/checks_superstaq/pytest_.py
@@ -75,7 +75,12 @@ def run(
     files = check_utils.extract_files(parsed_args, include, exclude, silent)
 
     if parsed_args.notebook:
-        args_to_pass += ["--nbmake", "--force-enable-socket"]
+        args_to_pass += [
+            "--nbval-lax",
+            "--dist=loadscope",
+            "--randomly-dont-reorganize",
+            "--force-enable-socket",
+        ]
     elif (parsed_args.integration) or (
         "--integration" not in args
         and any(re.match(r".*_integration_test\.py$", arg) for arg in args)
diff --git a/checks-superstaq/requirements.txt b/checks-superstaq/requirements.txt
index c68f43b18..f5d080a93 100644
--- a/checks-superstaq/requirements.txt
+++ b/checks-superstaq/requirements.txt
@@ -6,7 +6,7 @@ flake8-type-checking>=2.2.0
 ipywidgets>=8.0.0
 isort[colors]>=5.10.1
 mypy>=1.7.0
-nbmake>=1.3.0
+nbval>=0.11.0
 nbsphinx>=0.9.0
 numpy>=1.21.0
 pandoc>=2.3