diff --git a/custom-login/package.json b/custom-login/package.json
index 39a4c28..943fcde 100644
--- a/custom-login/package.json
+++ b/custom-login/package.json
@@ -6,7 +6,7 @@
     "ng": "ng",
     "start": "ng serve",
     "build": "ng build --prod --deploy-url /custom-login/ --base-href /custom-login/",
-    "test": "yarn lint && yarn test:custom-login --cwd ../",
+    "test": "yarn lint && yarn --cwd .. test:custom-login",
     "lint": "ng lint"
   },
   "private": true,
diff --git a/okta-hosted-login/package.json b/okta-hosted-login/package.json
index 2f7a433..6bff56d 100644
--- a/okta-hosted-login/package.json
+++ b/okta-hosted-login/package.json
@@ -6,7 +6,7 @@
     "ng": "ng",
     "start": "ng serve",
     "build": "ng build --prod --deploy-url /okta-hosted-login/ --base-href /okta-hosted-login/",
-    "test": "yarn lint && yarn test:okta-hosted-login --cwd ../",
+    "test": "yarn lint && yarn --cwd .. test:okta-hosted-login",
     "lint": "ng lint"
   },
   "private": true,
diff --git a/package.json b/package.json
index c7bae2a..ba8e138 100644
--- a/package.json
+++ b/package.json
@@ -3,14 +3,14 @@
   "version": "0.0.4",
   "description": "Angular Sample Applications for Okta",
   "scripts": {
-    "lint:okta-hosted-login": "yarn lint --cwd okta-hosted-login/",
-    "lint:custom-login": "yarn lint --cwd custom-login/",
+    "lint:okta-hosted-login": "yarn --cwd okta-hosted-login lint",
+    "lint:custom-login": "yarn --cwd custom-login lint",
     "lint": "yarn lint:okta-hosted-login && yarn lint:custom-login",
     "test": "yarn test:e2e",
     "test:e2e": "yarn test:okta-hosted-login && yarn test:custom-login",
-    "okta-hosted-login-server": "yarn start --cwd okta-hosted-login/",
+    "okta-hosted-login-server": "yarn --cwd okta-hosted-login start",
     "test:okta-hosted-login": "export TEST_TYPE=implicit || setx TEST_TYPE \"implicit\" && protractor protractor.conf.js --sample=okta-hosted-login --disableChecks",
-    "custom-login-server": "yarn start --cwd custom-login/",
+    "custom-login-server": "yarn --cwd custom-login start",
     "test:custom-login": "export TEST_TYPE=implicit || setx TEST_TYPE \"implicit\" && protractor protractor.conf.js --sample=custom-login --disableChecks",
     "resource-server": "node scripts/startResourceServer.js",
     "preresource-server": "yarn setup-env",