diff --git a/packages/core/src/babel-plugin-adjust-imports.ts b/packages/core/src/babel-plugin-adjust-imports.ts
index da377c7b4..699ec061c 100644
--- a/packages/core/src/babel-plugin-adjust-imports.ts
+++ b/packages/core/src/babel-plugin-adjust-imports.ts
@@ -516,5 +516,9 @@ function reliablyResolvable(pkg: V2Package, packageName: string) {
     return true;
   }
 
+  if (emberVirtualPeerDeps.has(packageName)) {
+    return true;
+  }
+
   return false;
 }
diff --git a/tests/scenarios/package.json b/tests/scenarios/package.json
index 5c19d00e6..e7bf20fc6 100644
--- a/tests/scenarios/package.json
+++ b/tests/scenarios/package.json
@@ -2,6 +2,7 @@
   "name": "@embroider/test-scenarios",
   "version": "0.0.0",
   "dependencies": {
+    "@embroider/shared-internals": "0.44.2",
     "@types/qunit": "^2.11.1",
     "fastboot": "^3.1.0",
     "fs-extra": "^10.0.0",
@@ -21,6 +22,7 @@
   "devDependencies": {
     "@ember/string": "^1.0.0",
     "@embroider/macros": "0.44.2",
+    "@embroider/addon-shim": "0.44.2",
     "bootstrap": "^4.3.1",
     "broccoli-funnel": "^3.0.5",
     "broccoli-merge-trees": "^3.0.2",
diff --git a/tests/scenarios/v2-addon-test.ts b/tests/scenarios/v2-addon-test.ts
new file mode 100644
index 000000000..87e7a0fdc
--- /dev/null
+++ b/tests/scenarios/v2-addon-test.ts
@@ -0,0 +1,96 @@
+import { appScenarios } from './scenarios';
+import { PreparedApp, Project } from 'scenario-tester';
+import QUnit from 'qunit';
+import merge from 'lodash/merge';
+import { AddonMeta } from '@embroider/shared-internals';
+const { module: Qmodule, test } = QUnit;
+
+appScenarios
+  .map('v2-addon', project => {
+    let meta: AddonMeta = {
+      type: 'addon',
+      version: 2,
+      'app-js': {
+        './components/example-component.js': 'app/components/example-component.js',
+      },
+      main: 'addon-main.js',
+    };
+
+    let packageJSON = {
+      keywords: ['ember-addon'],
+      'ember-addon': meta,
+    };
+
+    let addon = new Project({
+      name: 'v2-addon',
+      files: {
+        'package.json': JSON.stringify(packageJSON, null, 2),
+        app: {
+          components: {
+            'example-component.js': `export { default } from 'v2-addon/components/example-component';`,
+          },
+        },
+        'addon-main.js': `
+          const { addonV1Shim } = require('@embroider/addon-shim');
+          module.exports = addonV1Shim(__dirname);
+        `,
+        components: {
+          'example-component.js': `
+              import Component from '@glimmer/component';
+              import { hbs } from 'ember-cli-htmlbars';
+              import { setComponentTemplate } from '@ember/component';
+              const TEMPLATE = hbs('<div data-test-example>{{this.message}}</div>')
+              export default class ExampleComponent extends Component {
+                message = "it worked"
+              }
+              setComponentTemplate(TEMPLATE, ExampleComponent);
+            `,
+        },
+      },
+    });
+    addon.linkDependency('@embroider/addon-shim', { baseDir: __dirname });
+
+    project.addDevDependency(addon);
+
+    merge(project.files, {
+      app: {
+        templates: {
+          'index.hbs': `
+            <ExampleComponent />
+          `,
+        },
+      },
+      tests: {
+        acceptance: {
+          'index-test.js': `
+            import { module, test } from 'qunit';
+            import { visit } from '@ember/test-helpers';
+            import { setupApplicationTest } from 'ember-qunit';
+            import { getOwnConfig } from '@embroider/macros';
+
+            module('Acceptance | index', function(hooks) {
+              setupApplicationTest(hooks);
+
+              test('hello world', async function(assert) {
+                await visit('/');
+                assert.ok(document.querySelector('[data-test-example]'), 'it worked');
+              });
+            });
+          `,
+        },
+      },
+    });
+  })
+  .forEachScenario(scenario => {
+    Qmodule(scenario.name, function (hooks) {
+      let app: PreparedApp;
+      hooks.before(async () => {
+        app = await scenario.prepare();
+      });
+
+      test(`yarn test`, async function (assert) {
+        let result = await app.execute('yarn test');
+        assert.equal(result.exitCode, 0, result.output);
+      });
+    });
+  });