diff --git a/lib/hooks/userspace/hook-hapi.js b/lib/hooks/userspace/hook-hapi.js
index 74c778f54..8114e6b52 100644
--- a/lib/hooks/userspace/hook-hapi.js
+++ b/lib/hooks/userspace/hook-hapi.js
@@ -23,7 +23,7 @@ var semver = require('semver');
 var constants = require('../../constants.js');
 var agent;
 
-var SUPPORTED_VERSIONS = '8 - 11';
+var SUPPORTED_VERSIONS = '8 - 13';
 
 function connectionWrap(connection) {
   return function connectionTrace() {
diff --git a/test/hooks/fixtures/hapi12/index.js b/test/hooks/fixtures/hapi12/index.js
new file mode 100644
index 000000000..cb05a97e8
--- /dev/null
+++ b/test/hooks/fixtures/hapi12/index.js
@@ -0,0 +1 @@
+module.exports = require('hapi');
diff --git a/test/hooks/fixtures/hapi12/package.json b/test/hooks/fixtures/hapi12/package.json
new file mode 100644
index 000000000..85cd93ac6
--- /dev/null
+++ b/test/hooks/fixtures/hapi12/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "hapi12",
+  "version": "1.0.0",
+  "main": "index.js",
+  "dependencies": {
+    "hapi": "^12.1.0"
+  }
+}
diff --git a/test/hooks/fixtures/hapi13/index.js b/test/hooks/fixtures/hapi13/index.js
new file mode 100644
index 000000000..cb05a97e8
--- /dev/null
+++ b/test/hooks/fixtures/hapi13/index.js
@@ -0,0 +1 @@
+module.exports = require('hapi');
diff --git a/test/hooks/fixtures/hapi13/package.json b/test/hooks/fixtures/hapi13/package.json
new file mode 100644
index 000000000..0f801c2b2
--- /dev/null
+++ b/test/hooks/fixtures/hapi13/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "hapi13",
+  "version": "1.0.0",
+  "main": "index.js",
+  "dependencies": {
+    "hapi": "^13.2.1"
+  }
+}
diff --git a/test/hooks/test-trace-hapi.js b/test/hooks/test-trace-hapi.js
index e8f60ddbf..b1b57683e 100644
--- a/test/hooks/test-trace-hapi.js
+++ b/test/hooks/test-trace-hapi.js
@@ -20,18 +20,25 @@ var common = require('./common.js');
 var traceLabels = require('../../lib/trace-labels.js');
 var http = require('http');
 var assert = require('assert');
+var semver = require('semver');
 
 var server;
 
 var versions = {
-  hapi8: require('./fixtures/hapi8'),
-  hapi9: require('./fixtures/hapi9'),
-  hapi10: require('./fixtures/hapi10'),
-  hapi11: require('./fixtures/hapi11')
+  hapi8: './fixtures/hapi8',
+  hapi9: './fixtures/hapi9',
+  hapi10: './fixtures/hapi10',
+  hapi11: './fixtures/hapi11',
+  hapi12: './fixtures/hapi12',
+  hapi13: './fixtures/hapi13'
 };
 
 Object.keys(versions).forEach(function(version) {
-  var hapi = versions[version];
+  if (version.substring(4) > 10 && semver.satisfies(process.version, '<4')) {
+    // v11 started using ES6 features (const)
+    return;
+  }
+  var hapi = require(versions[version]);
   describe(version, function() {
     afterEach(function(done) {
       common.cleanTraces();
@@ -124,6 +131,7 @@ Object.keys(versions).forEach(function(version) {
 
     it('should accurately measure get time, after + get', function(done) {
       if (version.substring(4) > 10) {
+        // after was removed in v11 https://github.com/hapijs/hapi/issues/2850
         return done();
       }
       var afterSuccess = false;