diff --git a/tests/stencila/basic/archive/py-jupyter/bibliography.bibtex b/tests/stencila/pyjp/py-jupyter/bibliography.bibtex
similarity index 100%
rename from tests/stencila/basic/archive/py-jupyter/bibliography.bibtex
rename to tests/stencila/pyjp/py-jupyter/bibliography.bibtex
diff --git a/tests/stencila/basic/archive/py-jupyter/manifest.xml b/tests/stencila/pyjp/py-jupyter/manifest.xml
similarity index 100%
rename from tests/stencila/basic/archive/py-jupyter/manifest.xml
rename to tests/stencila/pyjp/py-jupyter/manifest.xml
diff --git a/tests/stencila/basic/archive/py-jupyter/py-jupyter.ipynb b/tests/stencila/pyjp/py-jupyter/py-jupyter.ipynb
similarity index 100%
rename from tests/stencila/basic/archive/py-jupyter/py-jupyter.ipynb
rename to tests/stencila/pyjp/py-jupyter/py-jupyter.ipynb
diff --git a/tests/stencila/basic/archive/py-jupyter/py-jupyter.ipynb.jats.xml b/tests/stencila/pyjp/py-jupyter/py-jupyter.ipynb.jats.xml
similarity index 100%
rename from tests/stencila/basic/archive/py-jupyter/py-jupyter.ipynb.jats.xml
rename to tests/stencila/pyjp/py-jupyter/py-jupyter.ipynb.jats.xml
diff --git a/tests/stencila/basic/verify b/tests/stencila/pyjp/verify
similarity index 100%
rename from tests/stencila/basic/verify
rename to tests/stencila/pyjp/verify
diff --git a/tests/stencila/basic/archive/r-markdown/bibliography.bibtex b/tests/stencila/r/r-markdown/bibliography.bibtex
similarity index 100%
rename from tests/stencila/basic/archive/r-markdown/bibliography.bibtex
rename to tests/stencila/r/r-markdown/bibliography.bibtex
diff --git a/tests/stencila/basic/archive/r-markdown/manifest.xml b/tests/stencila/r/r-markdown/manifest.xml
similarity index 100%
rename from tests/stencila/basic/archive/r-markdown/manifest.xml
rename to tests/stencila/r/r-markdown/manifest.xml
diff --git a/tests/stencila/basic/archive/r-markdown/rmarkdown.Rmd b/tests/stencila/r/r-markdown/rmarkdown.Rmd
similarity index 100%
rename from tests/stencila/basic/archive/r-markdown/rmarkdown.Rmd
rename to tests/stencila/r/r-markdown/rmarkdown.Rmd
diff --git a/tests/stencila/basic/archive/r-markdown/rmarkdown.Rmd.jats.xml b/tests/stencila/r/r-markdown/rmarkdown.Rmd.jats.xml
similarity index 100%
rename from tests/stencila/basic/archive/r-markdown/rmarkdown.Rmd.jats.xml
rename to tests/stencila/r/r-markdown/rmarkdown.Rmd.jats.xml
diff --git a/tests/stencila/r/verify b/tests/stencila/r/verify
new file mode 100755
index 00000000..2bd4ad54
--- /dev/null
+++ b/tests/stencila/r/verify
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+jupyter serverextension list 2>&1 | grep nbstencilaproxy
+jupyter nbextension list 2>&1 | grep nbstencilaproxy
+R -e "library('stencila');"