diff --git a/package.json b/package.json
index 588de43293ad..e074cfa5e708 100644
--- a/package.json
+++ b/package.json
@@ -8,15 +8,17 @@
     "packages/*"
   ],
   "scripts": {
-    "pkgparse": "echo ${PKGS:-'*'} | sed -e 's#,# @eth-optimism/#g' -e 's#^#@eth-optimism/#'",
+    "pkgparse": "echo ${PKGS:-'*'} | sed -e 's#,# @eth-optimism*/#g' -e 's#^#@eth-optimism*/#'",
+    "pkgparse:core": "echo ${PKGS:-'*'} | sed -e 's#,# @eth-optimism/#g' -e 's#^#@eth-optimism/#'",
+    "pkgparse:integration": "echo ${PKGS:-'*'} | sed -e 's#,# @eth-optimism-test/#g' -e 's#^#@eth-optimism-test/#'",
     "lint": "wsrun -p $(yarn --silent run pkgparse) --parallel --exclude-missing lint",
     "fix": "wsrun -p $(yarn --silent run pkgparse) --fast-exit --parallel --exclude-missing fix",
     "clean": "wsrun -p $(yarn --silent run pkgparse) -r --fast-exit --parallel --exclude-missing clean",
     "clean_modules": "rm -rf node_modules && find ./packages -type d -maxdepth 2 -name \"node_modules\" -exec rm -r {} +",
     "clean_manual": "find ./packages -type d -maxdepth 2 -name \"build\" -exec rm -r {} +",
-    "test:integration": "for package in `ls packages | grep '^test-'`; do\n cd packages/$package && yarn test; cd -; done",
-    "test:core": "for package in `ls packages | grep -v '^test-'`; do\n cd packages/$package && yarn test; cd -; done",
-    "test": "wsrun -p $(yarn --silent run pkgparse) --fast-exit --parallel --no-prefix --exclude-missing --timeout 5000 test",
+    "test:integration": "wsrun -p $(yarn --silent run pkgparse:integration) --fast-exit --serial --no-prefix --exclude-missing --timeout 5000 test",
+    "test:core": "wsrun -p $(yarn --silent run pkgparse:core) --fast-exit --parallel --no-prefix --exclude-missing --timeout 5000 test",
+    "test": "yarn test:core && yarn test:integration",
     "build": "lerna link && wsrun -p $(yarn --silent run pkgparse) -r --fast-exit --stages --exclude-missing build",
     "all": "yarn clean && yarn build && yarn test && yarn fix && yarn lint",
     "release": "yarn run build && lerna publish --force-publish --exact -m \"chore(@ethereum-optimism) publish %s release\"",