diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4f2d881eff..73cd559039 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -122,6 +122,16 @@ jobs:
           root: ~/project
           paths:
             - yarn
+  test-pkg-tests-linux-node13:
+    <<: *docker_defaults
+    docker:
+      - image: node:13
+    <<: *pkg_tests
+  test-pkg-tests-linux-node12:
+    <<: *docker_defaults
+    docker:
+      - image: node:12
+    <<: *pkg_tests
   test-pkg-tests-linux-node10:
     <<: *docker_defaults
     docker:
@@ -130,8 +140,20 @@ jobs:
   test-pkg-tests-linux-node8:
     <<: *docker_defaults
     <<: *pkg_tests
+  test-linux-node13:
+    <<: *docker_defaults
+    docker:
+      - image: node:13
+    <<: *test_steps
+  test-linux-node12:
+    <<: *docker_defaults
+    docker:
+      - image: node:12
+    <<: *test_steps
   test-linux-node10:
     <<: *docker_defaults
+    docker:
+      - image: node:10
     <<: *test_steps
   test-linux-node8:
     <<: *docker_defaults
@@ -249,6 +271,14 @@ workflows:
           filters: *default_filters
           requires:
             - install
+      - test-pkg-tests-linux-node13:
+          filters: *default_filters
+          requires:
+            - install
+      - test-pkg-tests-linux-node12:
+          filters: *default_filters
+          requires:
+            - install
       - test-pkg-tests-linux-node10:
           filters: *default_filters
           requires:
@@ -257,6 +287,14 @@ workflows:
           filters: *default_filters
           requires:
             - install
+      - test-linux-node13:
+          filters: *default_filters
+          requires:
+            - install
+      - test-linux-node12:
+          filters: *default_filters
+          requires:
+            - install
       - test-linux-node10:
           filters: *default_filters
           requires:
@@ -295,8 +333,12 @@ workflows:
             branches:
               ignore: /.*/
           requires:
+            - test-pkg-tests-linux-node13
+            - test-pkg-tests-linux-node12
             - test-pkg-tests-linux-node10
             - test-pkg-tests-linux-node8
+            - test-linux-node13
+            - test-linux-node12
             - test-linux-node10
             - test-linux-node8
             - test-linux-node6
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d4f72db86..d287c78698 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,10 +4,15 @@ Please add one entry in this file for each change in Yarn's behavior. Use the sa
 
 ## Master
 
+- Makes running scripts with Plug'n Play possible on node 13
+
+  [#7650](https://github.com/yarnpkg/yarn/pull/7650) - [**Sander Verweij**](https://github.com/sverweij)
+
 - Change run command to check cwd/node_modules/.bin for commands. Fixes run in workspaces.
 
   [#7151](https://github.com/yarnpkg/yarn/pull/7151) - [**Jeff Valore**](https://twitter.com/codingwithspike)
 
+
 ## 1.19.1
 
 **Important:** This release contains a cache bump. It will cause the very first install following the upgrade to take slightly more time, especially if you don't use the [Offline Mirror](https://yarnpkg.com/blog/2016/11/24/offline-mirror/) feature. After that everything will be back to normal.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c7b5e0e000..01d9333f35 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,6 +13,10 @@ jobs:
 #        node_version: 8.x
       node_10_x:
         node_version: 10.x
+      node_12_x:
+        node_version: 12.x
+      node_13_x:
+        node_version: 13.x
 
   steps:
   - template: scripts/azure-run-tests.yml
@@ -30,6 +34,10 @@ jobs:
         node_version: 8.x
       node_10_x:
         node_version: 10.x
+      node_12_x:
+        node_version: 12.x
+      node_13_x:
+        node_version: 13.x
 
   steps:
   - template: scripts/azure-run-tests.yml
@@ -47,6 +55,10 @@ jobs:
         node_version: 8.x
       node_10_x:
         node_version: 10.x
+      node_12_x:
+        node_version: 12.x
+      node_13_x:
+        node_version: 13.x
 
   steps:
   - template: scripts/azure-run-tests.yml
diff --git a/src/util/generate-pnp-map-api.tpl.js b/src/util/generate-pnp-map-api.tpl.js
index 835b6f85f1..c44db3605a 100644
--- a/src/util/generate-pnp-map-api.tpl.js
+++ b/src/util/generate-pnp-map-api.tpl.js
@@ -714,7 +714,7 @@ exports.setup = function setup() {
       return originalFindPath.call(Module, request, paths, isMain);
     }
 
-    for (const path of paths) {
+    for (const path of paths || []) {
       let resolution;
 
       try {