diff --git a/.travis.yml b/.travis.yml
index 048afdd5..f9d73fa5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,10 +14,9 @@ node_js:
   - "6"
   - "4"
 before_script:
-  - npm install -g istanbul grunt-cli
-  - npm install coveralls
-  - npm install git+https://github.com/node-red/node-red.git
-  - export NODE_RED_HOME=`pwd`/node_modules/node-red
-  - (cd $NODE_RED_HOME ; npm install nock@~0.48.0)
+  # Remove the './node_modules/.bin:' entry, see https://github.com/travis-ci/travis-ci/issues/8813
+  - export PATH=`echo ${PATH} | sed -re 's,(^|:)(./)?node_modules/.bin($|:),\1,'`
+  - npm install -g istanbul grunt-cli coveralls
+  - npm install node-red
 script:
-  - istanbul cover grunt --report lcovonly && istanbul report text && ( cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js || true ) && rm -rf coverage
+  - istanbul cover grunt --report lcovonly && istanbul report text && ( cat coverage/lcov.info | $(npm get prefix)/bin/coveralls || true ) && rm -rf coverage
diff --git a/README.md b/README.md
index 74444fef..d940b49a 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,13 @@ To manually install using this repo:
     - run `git clone https://github.com/node-red/node-red-nodes.git`
 3. run `npm install` in any of the node subfolders to install individual node's dependencies
 
+## Running Tests
+
+To run tests on all of the nodes you will need the node-red runtime:
+
+    npm install node-red --no-save
+    npm test
+
 ## Contributing
 
 Now that we support npm installation of nodes we recommend people post their own
diff --git a/package-lock.json b/package-lock.json
index 309f9dfa..240fd122 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red-nodes",
-    "version": "0.0.10",
+    "version": "0.0.11",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
@@ -16,6 +16,33 @@
             "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
             "dev": true
         },
+        "accepts": {
+            "version": "1.3.5",
+            "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
+            "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
+            "dev": true,
+            "requires": {
+                "mime-types": "2.1.18",
+                "negotiator": "0.6.1"
+            },
+            "dependencies": {
+                "mime-db": {
+                    "version": "1.33.0",
+                    "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
+                    "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
+                    "dev": true
+                },
+                "mime-types": {
+                    "version": "2.1.18",
+                    "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
+                    "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
+                    "dev": true,
+                    "requires": {
+                        "mime-db": "1.33.0"
+                    }
+                }
+            }
+        },
         "addressparser": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz",
@@ -55,6 +82,12 @@
                 "sprintf-js": "1.0.3"
             }
         },
+        "array-flatten": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+            "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+            "dev": true
+        },
         "asn1": {
             "version": "0.2.3",
             "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
@@ -123,6 +156,24 @@
                 "tweetnacl": "0.14.5"
             }
         },
+        "body-parser": {
+            "version": "1.18.2",
+            "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz",
+            "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=",
+            "dev": true,
+            "requires": {
+                "bytes": "3.0.0",
+                "content-type": "1.0.4",
+                "debug": "2.6.9",
+                "depd": "1.1.2",
+                "http-errors": "1.6.3",
+                "iconv-lite": "0.4.19",
+                "on-finished": "2.3.0",
+                "qs": "6.5.1",
+                "raw-body": "2.3.2",
+                "type-is": "1.6.16"
+            }
+        },
         "boom": {
             "version": "4.3.1",
             "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
@@ -179,6 +230,18 @@
                 }
             }
         },
+        "builtin-modules": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+            "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+            "dev": true
+        },
+        "bytes": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+            "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+            "dev": true
+        },
         "caseless": {
             "version": "0.12.0",
             "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
@@ -337,6 +400,30 @@
                 "date-now": "0.1.4"
             }
         },
+        "content-disposition": {
+            "version": "0.5.2",
+            "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+            "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
+            "dev": true
+        },
+        "content-type": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+            "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+            "dev": true
+        },
+        "cookie": {
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+            "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
+            "dev": true
+        },
+        "cookie-signature": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+            "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
+            "dev": true
+        },
         "cookiejar": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz",
@@ -434,6 +521,18 @@
             "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
             "dev": true
         },
+        "depd": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+            "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+            "dev": true
+        },
+        "destroy": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+            "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+            "dev": true
+        },
         "diff": {
             "version": "3.2.0",
             "resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz",
@@ -499,6 +598,18 @@
                 "jsbn": "0.1.1"
             }
         },
+        "ee-first": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+            "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+            "dev": true
+        },
+        "encodeurl": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+            "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+            "dev": true
+        },
         "encoding": {
             "version": "0.1.12",
             "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
@@ -514,6 +625,21 @@
             "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=",
             "dev": true
         },
+        "error-ex": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
+            "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
+            "dev": true,
+            "requires": {
+                "is-arrayish": "0.2.1"
+            }
+        },
+        "escape-html": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+            "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+            "dev": true
+        },
         "escape-string-regexp": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -532,6 +658,12 @@
             "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
             "dev": true
         },
+        "etag": {
+            "version": "1.8.1",
+            "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+            "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+            "dev": true
+        },
         "event-lite": {
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/event-lite/-/event-lite-0.1.1.tgz",
@@ -559,6 +691,44 @@
             "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
             "dev": true
         },
+        "express": {
+            "version": "4.16.2",
+            "resolved": "https://registry.npmjs.org/express/-/express-4.16.2.tgz",
+            "integrity": "sha1-41xt/i1kt9ygpc1PIXgb4ymeB2w=",
+            "dev": true,
+            "requires": {
+                "accepts": "1.3.5",
+                "array-flatten": "1.1.1",
+                "body-parser": "1.18.2",
+                "content-disposition": "0.5.2",
+                "content-type": "1.0.4",
+                "cookie": "0.3.1",
+                "cookie-signature": "1.0.6",
+                "debug": "2.6.9",
+                "depd": "1.1.2",
+                "encodeurl": "1.0.2",
+                "escape-html": "1.0.3",
+                "etag": "1.8.1",
+                "finalhandler": "1.1.0",
+                "fresh": "0.5.2",
+                "merge-descriptors": "1.0.1",
+                "methods": "1.1.2",
+                "on-finished": "2.3.0",
+                "parseurl": "1.3.2",
+                "path-to-regexp": "0.1.7",
+                "proxy-addr": "2.0.3",
+                "qs": "6.5.1",
+                "range-parser": "1.2.0",
+                "safe-buffer": "5.1.1",
+                "send": "0.16.1",
+                "serve-static": "1.13.1",
+                "setprototypeof": "1.1.0",
+                "statuses": "1.3.1",
+                "type-is": "1.6.16",
+                "utils-merge": "1.0.1",
+                "vary": "1.1.2"
+            }
+        },
         "extend": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
@@ -599,6 +769,30 @@
                 "merge-descriptors": "1.0.1"
             }
         },
+        "finalhandler": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
+            "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
+            "dev": true,
+            "requires": {
+                "debug": "2.6.9",
+                "encodeurl": "1.0.2",
+                "escape-html": "1.0.3",
+                "on-finished": "2.3.0",
+                "parseurl": "1.3.2",
+                "statuses": "1.3.1",
+                "unpipe": "1.0.0"
+            }
+        },
+        "find-up": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+            "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+            "dev": true,
+            "requires": {
+                "locate-path": "2.0.0"
+            }
+        },
         "findup-sync": {
             "version": "0.1.3",
             "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
@@ -669,6 +863,18 @@
             "integrity": "sha1-lriIb3w8NQi5Mta9cMTTqI818ak=",
             "dev": true
         },
+        "forwarded": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+            "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+            "dev": true
+        },
+        "fresh": {
+            "version": "0.5.2",
+            "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+            "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+            "dev": true
+        },
         "fs.realpath": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -842,6 +1048,38 @@
                 }
             }
         },
+        "grunt-cli": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.2.0.tgz",
+            "integrity": "sha1-VisRnrsGndtGSs4oRVAb6Xs1tqg=",
+            "dev": true,
+            "requires": {
+                "findup-sync": "0.3.0",
+                "grunt-known-options": "1.1.0",
+                "nopt": "3.0.6",
+                "resolve": "1.1.7"
+            },
+            "dependencies": {
+                "findup-sync": {
+                    "version": "0.3.0",
+                    "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
+                    "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
+                    "dev": true,
+                    "requires": {
+                        "glob": "5.0.15"
+                    }
+                },
+                "nopt": {
+                    "version": "3.0.6",
+                    "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+                    "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+                    "dev": true,
+                    "requires": {
+                        "abbrev": "1.1.1"
+                    }
+                }
+            }
+        },
         "grunt-contrib-jshint": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-1.1.0.tgz",
@@ -865,6 +1103,12 @@
                 "vow": "0.4.17"
             }
         },
+        "grunt-known-options": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.0.tgz",
+            "integrity": "sha1-pCdO6zL6dl2lp6OxcSYXzjsUQUk=",
+            "dev": true
+        },
         "grunt-legacy-log": {
             "version": "0.1.3",
             "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.3.tgz",
@@ -1057,6 +1301,12 @@
             "integrity": "sha1-uDT3I8xKJCqmWWNFnfbZhMXT2Vk=",
             "dev": true
         },
+        "hosted-git-info": {
+            "version": "2.6.0",
+            "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz",
+            "integrity": "sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw==",
+            "dev": true
+        },
         "htmlparser2": {
             "version": "3.8.3",
             "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
@@ -1070,6 +1320,26 @@
                 "readable-stream": "1.1.14"
             }
         },
+        "http-errors": {
+            "version": "1.6.3",
+            "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+            "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+            "dev": true,
+            "requires": {
+                "depd": "1.1.2",
+                "inherits": "2.0.3",
+                "setprototypeof": "1.1.0",
+                "statuses": "1.5.0"
+            },
+            "dependencies": {
+                "statuses": {
+                    "version": "1.5.0",
+                    "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+                    "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+                    "dev": true
+                }
+            }
+        },
         "http-signature": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@@ -1137,6 +1407,27 @@
             "integrity": "sha1-ngOdoEOyT3ixlrKD4EZT716ZD2E=",
             "dev": true
         },
+        "ipaddr.js": {
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz",
+            "integrity": "sha1-4/o1e3c9phnybpXwSdBVxyeW+Gs=",
+            "dev": true
+        },
+        "is-arrayish": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+            "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+            "dev": true
+        },
+        "is-builtin-module": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+            "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+            "dev": true,
+            "requires": {
+                "builtin-modules": "1.1.1"
+            }
+        },
         "is-object": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
@@ -1284,6 +1575,12 @@
                 }
             }
         },
+        "json-parse-better-errors": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+            "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+            "dev": true
+        },
         "json-schema": {
             "version": "0.2.3",
             "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@@ -1353,6 +1650,42 @@
             "integrity": "sha1-9ebgatdLeU+1tbZpiL9yjvHe2+g=",
             "dev": true
         },
+        "load-json-file": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+            "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+            "dev": true,
+            "requires": {
+                "graceful-fs": "4.1.11",
+                "parse-json": "4.0.0",
+                "pify": "3.0.0",
+                "strip-bom": "3.0.0"
+            },
+            "dependencies": {
+                "graceful-fs": {
+                    "version": "4.1.11",
+                    "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+                    "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+                    "dev": true
+                },
+                "strip-bom": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+                    "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+                    "dev": true
+                }
+            }
+        },
+        "locate-path": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+            "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+            "dev": true,
+            "requires": {
+                "p-locate": "2.0.0",
+                "path-exists": "3.0.0"
+            }
+        },
         "lodash": {
             "version": "4.6.1",
             "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.6.1.tgz",
@@ -1461,6 +1794,12 @@
                 "uue": "3.1.0"
             }
         },
+        "media-typer": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+            "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+            "dev": true
+        },
         "merge-descriptors": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -1650,6 +1989,12 @@
                 "iconv-lite": "0.4.19"
             }
         },
+        "negotiator": {
+            "version": "0.6.1",
+            "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
+            "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
+            "dev": true
+        },
         "ngeohash": {
             "version": "0.6.0",
             "resolved": "https://registry.npmjs.org/ngeohash/-/ngeohash-0.6.0.tgz",
@@ -1662,6 +2007,58 @@
             "integrity": "sha1-naYR6giYL0uUIGs760zJZl8gwwA=",
             "dev": true
         },
+        "node-red-node-test-helper": {
+            "version": "0.1.6",
+            "resolved": "https://registry.npmjs.org/node-red-node-test-helper/-/node-red-node-test-helper-0.1.6.tgz",
+            "integrity": "sha512-N+5261LE/9aSvd8jwIh7bxUpjYefaje4T9esYGdagoeiRlBiE7PhGCJtUUzesATdnaX5ZCItQg41bqzmS2xaOA==",
+            "dev": true,
+            "requires": {
+                "express": "4.16.2",
+                "read-pkg-up": "3.0.0",
+                "should": "8.4.0",
+                "sinon": "1.17.7",
+                "stoppable": "1.0.6",
+                "supertest": "3.0.0",
+                "when": "3.7.8"
+            },
+            "dependencies": {
+                "should": {
+                    "version": "8.4.0",
+                    "resolved": "https://registry.npmjs.org/should/-/should-8.4.0.tgz",
+                    "integrity": "sha1-XmCInT5kS73Tl6MM00+tKPz5C8A=",
+                    "dev": true,
+                    "requires": {
+                        "should-equal": "0.8.0",
+                        "should-format": "0.3.2",
+                        "should-type": "0.2.0"
+                    }
+                },
+                "should-equal": {
+                    "version": "0.8.0",
+                    "resolved": "http://registry.npmjs.org/should-equal/-/should-equal-0.8.0.tgz",
+                    "integrity": "sha1-o/BXMv9FusG3ukEvhAiFaBlkEpk=",
+                    "dev": true,
+                    "requires": {
+                        "should-type": "0.2.0"
+                    }
+                },
+                "should-format": {
+                    "version": "0.3.2",
+                    "resolved": "https://registry.npmjs.org/should-format/-/should-format-0.3.2.tgz",
+                    "integrity": "sha1-pZgx4Bot3uFJkRvHFIvlyAMZ4f8=",
+                    "dev": true,
+                    "requires": {
+                        "should-type": "0.2.0"
+                    }
+                },
+                "should-type": {
+                    "version": "0.2.0",
+                    "resolved": "https://registry.npmjs.org/should-type/-/should-type-0.2.0.tgz",
+                    "integrity": "sha1-ZwfvlVKdmJ3MCY/gdTqx+RNrt/Y=",
+                    "dev": true
+                }
+            }
+        },
         "nodemailer": {
             "version": "1.11.0",
             "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-1.11.0.tgz",
@@ -1745,12 +2142,33 @@
                 "abbrev": "1.1.1"
             }
         },
+        "normalize-package-data": {
+            "version": "2.4.0",
+            "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+            "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+            "dev": true,
+            "requires": {
+                "hosted-git-info": "2.6.0",
+                "is-builtin-module": "1.0.0",
+                "semver": "5.5.0",
+                "validate-npm-package-license": "3.0.3"
+            }
+        },
         "oauth-sign": {
             "version": "0.8.2",
             "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
             "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
             "dev": true
         },
+        "on-finished": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+            "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+            "dev": true,
+            "requires": {
+                "ee-first": "1.1.1"
+            }
+        },
         "once": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -1778,18 +2196,79 @@
                 }
             }
         },
+        "p-limit": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz",
+            "integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
+            "dev": true,
+            "requires": {
+                "p-try": "1.0.0"
+            }
+        },
+        "p-locate": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+            "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+            "dev": true,
+            "requires": {
+                "p-limit": "1.2.0"
+            }
+        },
+        "p-try": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+            "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+            "dev": true
+        },
         "package": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/package/-/package-1.0.1.tgz",
             "integrity": "sha1-0lofmeJQbcsn1nBLg9yooxLk7cw=",
             "dev": true
         },
+        "parse-json": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+            "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+            "dev": true,
+            "requires": {
+                "error-ex": "1.3.1",
+                "json-parse-better-errors": "1.0.2"
+            }
+        },
+        "parseurl": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
+            "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=",
+            "dev": true
+        },
+        "path-exists": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+            "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+            "dev": true
+        },
         "path-is-absolute": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
             "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
             "dev": true
         },
+        "path-to-regexp": {
+            "version": "0.1.7",
+            "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+            "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
+            "dev": true
+        },
+        "path-type": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+            "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+            "dev": true,
+            "requires": {
+                "pify": "3.0.0"
+            }
+        },
         "pathval": {
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/pathval/-/pathval-0.1.1.tgz",
@@ -1802,6 +2281,12 @@
             "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
             "dev": true
         },
+        "pify": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+            "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+            "dev": true
+        },
         "pkginfo": {
             "version": "0.4.1",
             "resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.1.tgz",
@@ -1836,6 +2321,16 @@
                 "winston": "0.8.3"
             }
         },
+        "proxy-addr": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz",
+            "integrity": "sha512-jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ==",
+            "dev": true,
+            "requires": {
+                "forwarded": "0.1.2",
+                "ipaddr.js": "1.6.0"
+            }
+        },
         "proxyquire": {
             "version": "1.8.0",
             "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-1.8.0.tgz",
@@ -1880,6 +2375,50 @@
             "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
             "dev": true
         },
+        "range-parser": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
+            "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
+            "dev": true
+        },
+        "raw-body": {
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
+            "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
+            "dev": true,
+            "requires": {
+                "bytes": "3.0.0",
+                "http-errors": "1.6.2",
+                "iconv-lite": "0.4.19",
+                "unpipe": "1.0.0"
+            },
+            "dependencies": {
+                "depd": {
+                    "version": "1.1.1",
+                    "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
+                    "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
+                    "dev": true
+                },
+                "http-errors": {
+                    "version": "1.6.2",
+                    "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
+                    "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
+                    "dev": true,
+                    "requires": {
+                        "depd": "1.1.1",
+                        "inherits": "2.0.3",
+                        "setprototypeof": "1.0.3",
+                        "statuses": "1.3.1"
+                    }
+                },
+                "setprototypeof": {
+                    "version": "1.0.3",
+                    "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
+                    "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=",
+                    "dev": true
+                }
+            }
+        },
         "read": {
             "version": "1.0.7",
             "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
@@ -1889,6 +2428,27 @@
                 "mute-stream": "0.0.7"
             }
         },
+        "read-pkg": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+            "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+            "dev": true,
+            "requires": {
+                "load-json-file": "4.0.0",
+                "normalize-package-data": "2.4.0",
+                "path-type": "3.0.0"
+            }
+        },
+        "read-pkg-up": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
+            "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+            "dev": true,
+            "requires": {
+                "find-up": "2.1.0",
+                "read-pkg": "3.0.0"
+            }
+        },
         "readable-stream": {
             "version": "1.1.14",
             "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
@@ -1981,6 +2541,51 @@
             "integrity": "sha1-vsEf3IOp/aBjQBIQ5AF2wwJNFWc=",
             "dev": true
         },
+        "semver": {
+            "version": "5.5.0",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+            "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
+            "dev": true
+        },
+        "send": {
+            "version": "0.16.1",
+            "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz",
+            "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==",
+            "dev": true,
+            "requires": {
+                "debug": "2.6.9",
+                "depd": "1.1.2",
+                "destroy": "1.0.4",
+                "encodeurl": "1.0.2",
+                "escape-html": "1.0.3",
+                "etag": "1.8.1",
+                "fresh": "0.5.2",
+                "http-errors": "1.6.3",
+                "mime": "1.4.1",
+                "ms": "2.0.0",
+                "on-finished": "2.3.0",
+                "range-parser": "1.2.0",
+                "statuses": "1.3.1"
+            }
+        },
+        "serve-static": {
+            "version": "1.13.1",
+            "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz",
+            "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==",
+            "dev": true,
+            "requires": {
+                "encodeurl": "1.0.2",
+                "escape-html": "1.0.3",
+                "parseurl": "1.3.2",
+                "send": "0.16.1"
+            }
+        },
+        "setprototypeof": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+            "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+            "dev": true
+        },
         "shelljs": {
             "version": "0.3.0",
             "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz",
@@ -2089,6 +2694,38 @@
                 "source-map": "0.5.7"
             }
         },
+        "spdx-correct": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
+            "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
+            "dev": true,
+            "requires": {
+                "spdx-expression-parse": "3.0.0",
+                "spdx-license-ids": "3.0.0"
+            }
+        },
+        "spdx-exceptions": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz",
+            "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==",
+            "dev": true
+        },
+        "spdx-expression-parse": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+            "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+            "dev": true,
+            "requires": {
+                "spdx-exceptions": "2.1.0",
+                "spdx-license-ids": "3.0.0"
+            }
+        },
+        "spdx-license-ids": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz",
+            "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==",
+            "dev": true
+        },
         "sprintf-js": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
@@ -2117,6 +2754,18 @@
             "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
             "dev": true
         },
+        "statuses": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
+            "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+            "dev": true
+        },
+        "stoppable": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/stoppable/-/stoppable-1.0.6.tgz",
+            "integrity": "sha512-d1B/3QXeT2+MixdC+EqQ9/llq3yvZkdsh8hrML52NmememiIAus0MBsnebYmzojJ2Ls5drhDqo2PFH1FLx2DWA==",
+            "dev": true
+        },
         "string_decoder": {
             "version": "0.10.31",
             "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
@@ -2274,6 +2923,33 @@
             "dev": true,
             "optional": true
         },
+        "type-is": {
+            "version": "1.6.16",
+            "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
+            "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+            "dev": true,
+            "requires": {
+                "media-typer": "0.3.0",
+                "mime-types": "2.1.18"
+            },
+            "dependencies": {
+                "mime-db": {
+                    "version": "1.33.0",
+                    "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
+                    "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
+                    "dev": true
+                },
+                "mime-types": {
+                    "version": "2.1.18",
+                    "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
+                    "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
+                    "dev": true,
+                    "requires": {
+                        "mime-db": "1.33.0"
+                    }
+                }
+            }
+        },
         "typedarray-to-buffer": {
             "version": "3.1.2",
             "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.2.tgz",
@@ -2295,6 +2971,12 @@
             "integrity": "sha1-18D6KvXVoaZ/QlPa7pgTLnM/Dxk=",
             "dev": true
         },
+        "unpipe": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+            "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+            "dev": true
+        },
         "utf7": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/utf7/-/utf7-1.0.2.tgz",
@@ -2349,6 +3031,12 @@
                 "rimraf": "2.2.8"
             }
         },
+        "utils-merge": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+            "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+            "dev": true
+        },
         "uue": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/uue/-/uue-3.1.0.tgz",
@@ -2364,6 +3052,22 @@
             "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
             "dev": true
         },
+        "validate-npm-package-license": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz",
+            "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==",
+            "dev": true,
+            "requires": {
+                "spdx-correct": "3.0.0",
+                "spdx-expression-parse": "3.0.0"
+            }
+        },
+        "vary": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+            "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+            "dev": true
+        },
         "verror": {
             "version": "1.10.0",
             "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
diff --git a/package.json b/package.json
index b2b8943b..d88802dc 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,9 @@
         "type": "git",
         "url": "https://github.com/node-red/node-red-nodes.git"
     },
+    "scripts": {
+        "test": "grunt"
+    },
     "contributors": [
         {
             "name": "Dave Conway-Jones"
@@ -29,6 +32,7 @@
     "devDependencies": {
         "exif": "^0.6.0",
         "grunt": "^0.4.5",
+        "grunt-cli": "^1.2.0",
         "grunt-contrib-jshint": "^1.1.0",
         "grunt-jscs": "^3.0.1",
         "grunt-lint-inline": "^1.0.0",
@@ -38,14 +42,17 @@
         "mocha": "~3.5.3",
         "msgpack-lite": "^0.1.26",
         "ngeohash": "^0.6.0",
+        "node-red-node-test-helper": "^0.1.6",
         "nodemailer": "^1.11.0",
         "poplib": "^0.1.7",
         "proxyquire": "^1.7.11",
         "pushbullet": "~2.1.0",
         "should": "^11.2.1",
         "sinon": "^1.17.7",
-        "stoppable": "~1.0.6",
         "supertest": "^3.0.0",
         "when": "^3.7.8"
+    },
+    "peerDependencies": {
+        "node-red": "^0.18.4"
     }
 }
diff --git a/test/function/random/random_spec.js b/test/function/random/random_spec.js
index e1b9939f..ffd119f2 100644
--- a/test/function/random/random_spec.js
+++ b/test/function/random/random_spec.js
@@ -1,6 +1,6 @@
 
 var should = require("should");
-var helper = require('../../../test/helper.js');
+var helper = require('node-red-node-test-helper');
 var testNode = require('../../../function/random/random.js');
 
 describe('random node', function() {
diff --git a/test/function/rbe/rbe_spec.js b/test/function/rbe/rbe_spec.js
index f41517d7..9d9a9425 100644
--- a/test/function/rbe/rbe_spec.js
+++ b/test/function/rbe/rbe_spec.js
@@ -1,6 +1,6 @@
 
 var should = require("should");
-var helper = require('../../../test/helper.js');
+var helper = require("node-red-node-test-helper");
 var testNode = require('../../../function/rbe/rbe.js');
 
 describe('rbe node', function() {
diff --git a/test/function/smooth/17-smooth_spec.js b/test/function/smooth/17-smooth_spec.js
index 4a9d2b83..33188765 100644
--- a/test/function/smooth/17-smooth_spec.js
+++ b/test/function/smooth/17-smooth_spec.js
@@ -1,6 +1,6 @@
 
 var should = require("should");
-var helper = require('../../../test/helper.js');
+var helper = require("node-red-node-test-helper");
 var testNode = require('../../../function/smooth/17-smooth.js');
 
 describe('smooth node', function() {
diff --git a/test/helper.js b/test/helper.js
deleted file mode 100644
index 8192cdeb..00000000
--- a/test/helper.js
+++ /dev/null
@@ -1,12 +0,0 @@
-
-var path = require('path');
-
-process.env.NODE_RED_HOME = process.env.NODE_RED_HOME || path.resolve(__dirname+"/../../node-red");
-var helper = require(path.join(process.env.NODE_RED_HOME, 'test', 'nodes', 'helper.js'));
-
-try {
-    helper.nock = helper.nock || require("nock");
-} catch(er) {
-    helper.nock = null;
-}
-module.exports = helper;
diff --git a/test/parsers/base64/70-base64_spec.js b/test/parsers/base64/70-base64_spec.js
index 68460951..26c24c9a 100644
--- a/test/parsers/base64/70-base64_spec.js
+++ b/test/parsers/base64/70-base64_spec.js
@@ -1,6 +1,6 @@
 
 var should = require("should");
-var helper = require('../../../test/helper.js');
+var helper = require("node-red-node-test-helper");
 var testNode = require('../../../parsers/base64/70-base64.js');
 
 describe('base64 node', function() {
diff --git a/test/parsers/geohash/70-geohash_spec.js b/test/parsers/geohash/70-geohash_spec.js
index 5be66892..ffc2dc0c 100644
--- a/test/parsers/geohash/70-geohash_spec.js
+++ b/test/parsers/geohash/70-geohash_spec.js
@@ -15,7 +15,7 @@
  **/
 
 var should = require("should");
-var helper = require('../../../test/helper.js');
+var helper = require("node-red-node-test-helper");
 var testNode = require('../../../parsers/geohash/70-geohash.js');
 
 describe('geohash node', function() {
diff --git a/test/parsers/msgpack/70-msgpack_spec.js b/test/parsers/msgpack/70-msgpack_spec.js
index b8bd1275..09cda4e8 100644
--- a/test/parsers/msgpack/70-msgpack_spec.js
+++ b/test/parsers/msgpack/70-msgpack_spec.js
@@ -1,6 +1,6 @@
 
 var should = require("should");
-var helper = require('../../../test/helper.js');
+var helper = require("node-red-node-test-helper");
 var testNode = require('../../../parsers/msgpack/70-msgpack.js');
 
 describe('msgpack node', function() {
diff --git a/test/social/email/61-email_spec.js b/test/social/email/61-email_spec.js
index ac8a4b3a..03caa0a6 100644
--- a/test/social/email/61-email_spec.js
+++ b/test/social/email/61-email_spec.js
@@ -1,6 +1,6 @@
 var should = require("should");
 var sinon = require("sinon");
-var helper = require('../../../test/helper.js');
+var helper = require("node-red-node-test-helper");
 var emailNode = require('../../../social/email/61-email.js');
 
 describe('email Node', function () {
diff --git a/test/social/pushbullet/57-pushbullet_spec.js b/test/social/pushbullet/57-pushbullet_spec.js
index beaec5a9..aba706e1 100644
--- a/test/social/pushbullet/57-pushbullet_spec.js
+++ b/test/social/pushbullet/57-pushbullet_spec.js
@@ -8,7 +8,7 @@ var EventEmitter = require('events').EventEmitter
 var util = require('util');
 var data = require("./data");
 var path = require("path");
-var helper = require('../../../test/helper.js');
+var helper = require("node-red-node-test-helper");
 
 // Mute "Starting/Stopping flows to stdout"
 
diff --git a/test/utility/exif/94-exif_spec.js b/test/utility/exif/94-exif_spec.js
index 47fcc383..bdf33e7a 100644
--- a/test/utility/exif/94-exif_spec.js
+++ b/test/utility/exif/94-exif_spec.js
@@ -2,7 +2,7 @@
 var should = require("should");
 var sinon = require('sinon');
 //var fs = require("fs");
-var helper = require('../../../test/helper.js');
+var helper = require("node-red-node-test-helper");
 var exifNode = require('../../../utility/exif/94-exif.js');
 
 describe('exif node', function() {