diff --git a/index.js b/index.js
index 77f98287f..869a6e5f7 100644
--- a/index.js
+++ b/index.js
@@ -81,7 +81,8 @@ module.exports = {
   _resolvePackagePath(pkgPath) {
     let parts = pkgPath.split('/');
     let pkg = parts[0];
-    let result = path.dirname(resolve.sync(`${pkg}/package.json`, { basedir: this.project.root }));
+    let basedir = parentIsAddon(this.parent.pkg) ? this.root : this.project.root;
+    let result = path.dirname(resolve.sync(`${pkg}/package.json`, { basedir }));
 
     // add sub folders to path
     if (parts.length > 1) {
@@ -91,3 +92,7 @@ module.exports = {
     return result;
   }
 };
+
+function parentIsAddon(parentPkg) {
+  return parentPkg.keywords && parentPkg.keywords.includes('ember-addon');
+}
diff --git a/package.json b/package.json
index 9c2d63e6e..c5aedd596 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "money-formatter": "^0.1.4"
   },
   "peerDependencies": {
-    "qunit": "^2"
+    "qunit": "^2.x"
   },
   "devDependencies": {
     "@babel/core": "^7.11.6",