diff --git a/.travis.yml b/.travis.yml
index 93f45a5419f..5b3b84728c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,9 +65,10 @@ jobs:
       env: TARGET_IE11=true
       script: yarn test
 
-    - name: 'Node Tests'
-      install: yarn install
-      script: yarn test:node
+    # See https://github.com/emberjs/data/pull/6241
+    # - name: 'Node Tests'
+    #   install: yarn install
+    #   script: yarn test:node
 
     # runs tests against each supported Ember version
     - stage: ember version tests
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a4d13cfe135..909fc8129aa 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -84,9 +84,10 @@ jobs:
           TARGET_IE11=true yarn test
         displayName: 'Max transpilation Tests'
 
-      - script: |
-          yarn test:node
-        displayName: 'Node Tests'
+      # See https://github.com/emberjs/data/pull/6241
+      # - script: |
+      #     yarn test:node
+      #   displayName: 'Node Tests'
 
       - script: |
           yarn test:try-one with-ember-fetch
diff --git a/packages/-ember-data/blueprints/adapter-test/index.js b/packages/-ember-data/blueprints/adapter-test/index.js
new file mode 100644
index 00000000000..0285c42143b
--- /dev/null
+++ b/packages/-ember-data/blueprints/adapter-test/index.js
@@ -0,0 +1,4 @@
+// Re-exporting the blueprints from the top level `ember-data` package
+// because blueprint discovery in ember-cli (as of 3.12) is only done
+// for top level packages.
+module.exports = require('@ember-data/adapter/blueprints/adapter-test');
diff --git a/packages/-ember-data/blueprints/adapter/index.js b/packages/-ember-data/blueprints/adapter/index.js
new file mode 100644
index 00000000000..da0a6c102c1
--- /dev/null
+++ b/packages/-ember-data/blueprints/adapter/index.js
@@ -0,0 +1,4 @@
+// Re-exporting the blueprints from the top level `ember-data` package
+// because blueprint discovery in ember-cli (as of 3.12) is only done
+// for top level packages.
+module.exports = require('@ember-data/adapter/blueprints/adapter');
diff --git a/packages/-ember-data/blueprints/model-test/index.js b/packages/-ember-data/blueprints/model-test/index.js
new file mode 100644
index 00000000000..3b54452d580
--- /dev/null
+++ b/packages/-ember-data/blueprints/model-test/index.js
@@ -0,0 +1,4 @@
+// Re-exporting the blueprints from the top level `ember-data` package
+// because blueprint discovery in ember-cli (as of 3.12) is only done
+// for top level packages.
+module.exports = require('@ember-data/model/blueprints/model-test');
diff --git a/packages/-ember-data/blueprints/model/index.js b/packages/-ember-data/blueprints/model/index.js
new file mode 100644
index 00000000000..02f9819b4f7
--- /dev/null
+++ b/packages/-ember-data/blueprints/model/index.js
@@ -0,0 +1,4 @@
+// Re-exporting the blueprints from the top level `ember-data` package
+// because blueprint discovery in ember-cli (as of 3.12) is only done
+// for top level packages.
+module.exports = require('@ember-data/model/blueprints/model');
diff --git a/packages/-ember-data/blueprints/serializer-test/index.js b/packages/-ember-data/blueprints/serializer-test/index.js
new file mode 100644
index 00000000000..928704fce18
--- /dev/null
+++ b/packages/-ember-data/blueprints/serializer-test/index.js
@@ -0,0 +1,4 @@
+// Re-exporting the blueprints from the top level `ember-data` package
+// because blueprint discovery in ember-cli (as of 3.12) is only done
+// for top level packages.
+module.exports = require('@ember-data/serializer/blueprints/serializer-test');
diff --git a/packages/-ember-data/blueprints/serializer/index.js b/packages/-ember-data/blueprints/serializer/index.js
new file mode 100644
index 00000000000..b610a185d1d
--- /dev/null
+++ b/packages/-ember-data/blueprints/serializer/index.js
@@ -0,0 +1,4 @@
+// Re-exporting the blueprints from the top level `ember-data` package
+// because blueprint discovery in ember-cli (as of 3.12) is only done
+// for top level packages.
+module.exports = require('@ember-data/serializer/blueprints/serializer');
diff --git a/packages/-ember-data/blueprints/transform-test/index.js b/packages/-ember-data/blueprints/transform-test/index.js
new file mode 100644
index 00000000000..8347ca35e74
--- /dev/null
+++ b/packages/-ember-data/blueprints/transform-test/index.js
@@ -0,0 +1,4 @@
+// Re-exporting the blueprints from the top level `ember-data` package
+// because blueprint discovery in ember-cli (as of 3.12) is only done
+// for top level packages.
+module.exports = require('@ember-data/serializer/blueprints/transform-test');
diff --git a/packages/-ember-data/blueprints/transform/index.js b/packages/-ember-data/blueprints/transform/index.js
new file mode 100644
index 00000000000..4c8fe435099
--- /dev/null
+++ b/packages/-ember-data/blueprints/transform/index.js
@@ -0,0 +1,4 @@
+// Re-exporting the blueprints from the top level `ember-data` package
+// because blueprint discovery in ember-cli (as of 3.12) is only done
+// for top level packages.
+module.exports = require('@ember-data/serializer/blueprints/transform');