diff --git a/packages/compat/src/compat-adapters/ember-test-selectors.ts b/packages/compat/src/compat-adapters/ember-test-selectors.ts
index 83bb4aa77..a8161e938 100644
--- a/packages/compat/src/compat-adapters/ember-test-selectors.ts
+++ b/packages/compat/src/compat-adapters/ember-test-selectors.ts
@@ -1,12 +1,14 @@
 import V1Addon from '../v1-addon';
 import { forceIncludeModule } from '../compat-utils';
+import semver from 'semver';
 
 export default class extends V1Addon {
+  // v6.0.0 of ember-test-selectors dropped the attribute binding for classic components
+  static shouldApplyAdapter(addonInstance: any) {
+    return semver.lt(addonInstance.pkg.version, '6.0.0') && !addonInstance._stripTestSelectors;
+  }
+
   get packageMeta() {
-    if (this.addonInstance._stripTestSelectors) {
-      return super.packageMeta;
-    } else {
-      return forceIncludeModule(super.packageMeta, './utils/bind-data-test-attributes');
-    }
+    return forceIncludeModule(super.packageMeta, './utils/bind-data-test-attributes');
   }
 }