diff --git a/package.json b/package.json
index 8a25b37..5be31a2 100644
--- a/package.json
+++ b/package.json
@@ -19,9 +19,12 @@
     "Richard Chamberlain <richard_chamberlain@uk.ibm.com> (https://github.com/rnchamberlain)"
   ],
   "scripts": {
-    "test": "node test/autorun.js"
+    "test": "tap test/test*.js"
   },
   "bugs": {
     "url": "https://github.com/nodejs/nodereport/issues"
+  },
+  "devDependencies": {
+    "tap": "^8.0.0"
   }
 }
diff --git a/test/autorun.js b/test/autorun.js
deleted file mode 100644
index 63a1bea..0000000
--- a/test/autorun.js
+++ /dev/null
@@ -1,129 +0,0 @@
-// Testcase for nodereport. Triggers and validates NodeReport files
-// 
-// Parameter(s): --save_log  (optional) preserves verbose log file
-//
-'use strict';
-
-const assert = require('assert');
-const spawn = require('child_process').spawn;
-const readline = require('readline');
-const fs = require('fs');
-const path = require('path');
-
-var results;
-if (process.platform === 'win32') {
-  results = ['fail','fail','fail'];
-} else { 
-  results = ['fail','fail','fail','fail'];
-}
-
-// Open a log file to record verbose test output
-const stdio_log = fs.openSync('./nodereport_test.log', 'w');
-
-// Test #1: Run child process to call API to generate a NodeReport
-console.log('autorun.js: running child process #1 to produce NodeReport on API call');
-var child1 = spawn(process.execPath, [path.resolve(__dirname, 'test_1.js')], {stdio: ['pipe', stdio_log, stdio_log]});
-child1.on('exit', function(code, signal) {
-  assert.ok(code == 0);
-  // Locate and validate the NodeReport
-  var report = locate(child1.pid);
-  if (report) {
-    validate(report, 1);
-    fs.unlink(report); // delete the file when we are done
-  }
-});
-
-// Test #2: Run child process to produce unhandled exception and generate a NodeReport
-console.log('autorun.js: running child process #2 to produce NodeReport on exception');
-var child2 = spawn(process.execPath, [path.resolve(__dirname, 'test_2.js')], {stdio: ['pipe', stdio_log, stdio_log]});
-child2.on('exit', function(code, signal) {
-  assert.ok(code !== 0);
-  // Locate and validate the NodeReport
-  var report = locate(child2.pid);
-  if (report) {
-    validate(report, 2);
-    fs.unlink(report); // delete the file when we are done
-  }
-});
-
-// Test #3: Run child process to produce fatal error (heap OOM) and generate a NodeReport
-console.log('autorun.js: running child process #3 to produce NodeReport on fatal error');
-var child3 = spawn(process.execPath, ['--max-old-space-size=20', path.resolve(__dirname, 'test_3.js')], {stdio: ['pipe', stdio_log, stdio_log]});
-child3.on('exit', function(code, signal) {
-  assert.ok(code !== 0);
-  // Locate and validate the NodeReport
-  var report = locate(child3.pid);
-  if (report) {
-    validate(report, 3);
-    fs.unlink(report); // delete the file when we are done
-  }
-});
-
-// Test #4: Run child process to loop, then send SIGUSR2 to generate a NodeReport
-if (process.platform === 'win32') {
-  // Not supported on Windows
-} else {
-  console.log('autorun.js: running child process #4 to produce NodeReport on SIGUSR2');
-  var child4 = spawn(process.execPath, [path.resolve(__dirname, 'test_4.js')], {stdio: ['pipe', stdio_log, stdio_log]});
-  setTimeout(function() {
-    child4.kill('SIGUSR2');
-    setTimeout(function() {
-      child4.kill('SIGTERM');
-    }, 1000);
-  }, 1000);
-  child4.on('exit', function(code, signal) {
-    // Locate and validate the NodeReport
-    var report = locate(child4.pid);
-    if (report) {
-      validate(report, 4);
-      fs.unlink(report); // delete the file when we are done
-    }
-  });
-}
-
-// Print out results of all the tests on exit
-process.on('exit', function() {
-  console.log('autorun.js: test results: ');
-  for (var i = 0; i < results.length; i++) {
-    console.log('\ttest', i+1, ': ', results[i]);
-  }
-  // Close the verbose output log file, and delete it unless --save_log was specified
-  fs.close(stdio_log);
-  if (!(process.argv[2] === '--save_log')) {
-    fs.unlink('./nodereport_test.log');
-  }
-});
-
-// Utility function - locate a NodeReport produced by a process with the given PID
-function locate(pid) {
-  var files = fs.readdirSync(".");
-  for (var i = 0; i < files.length; i++) {
-    if (files[i].substring(0, 10) == 'NodeReport' && files[i].indexOf(pid) != -1) {
-      console.log('autorun.js: located NodeReport: ', files[i]);
-      return files[i];
-    }
-  }
-  return;
-}
-
-// Utility function - validate a NodeReport (check all the sections are there) - and save result
-function validate(report, index) {
-  var validationCount = 0;
-  const reader = readline.createInterface({
-    input: fs.createReadStream(report)
-  });
-  reader.on('line', (line) => {
-    //console.log('Line from file:', line);
-    if ((line.indexOf('==== NodeReport') > -1) ||
-        (line.indexOf('==== JavaScript Stack Trace') > -1) ||
-        (line.indexOf('==== JavaScript Heap') > -1) ||
-        (line.indexOf('==== System Information') > -1)) {
-      validationCount++; // found expected section in NodeReport
-    }
-  });
-  reader.on('close', () => {
-    if (validationCount == 4) {
-      results[index-1] = 'pass';
-    } 
-  });
-}
diff --git a/test/common.js b/test/common.js
new file mode 100644
index 0000000..9bb24d4
--- /dev/null
+++ b/test/common.js
@@ -0,0 +1,36 @@
+'use strict';
+
+const fs = require('fs');
+
+const REPORT_SECTIONS = [
+  'NodeReport',
+  'JavaScript Stack Trace',
+  'JavaScript Heap',
+  'System Information'
+];
+
+exports.findReports = (pid) => {
+  // Default filenames are of the form NodeReport.<date>.<time>.<pid>.<seq>.txt
+  const format = '^NodeReport\\.\\d+\\.\\d+\\.' + pid + '\\.\\d+\\.txt$';
+  const filePattern = new RegExp(format);
+  const files = fs.readdirSync('.');
+  return files.filter((file) => filePattern.test(file));
+};
+
+exports.validate = (t, report, pid) => {
+  t.test('Validating ' + report, (t) => {
+    fs.readFile(report, (err, data) => {
+      const reportContents = data.toString();
+      const plan = REPORT_SECTIONS.length + (pid ? 1 : 0);
+      t.plan(plan);
+      if (pid) {
+        t.match(reportContents, new RegExp('Process ID: ' + pid),
+                'Checking report contains expected process ID ' + pid);
+      }
+      REPORT_SECTIONS.forEach((section) => {
+        t.match(reportContents, new RegExp('==== ' + section),
+                'Checking report contains ' + section + ' section');
+      });
+    });
+  });
+};
diff --git a/test/test-api.js b/test/test-api.js
new file mode 100644
index 0000000..f254707
--- /dev/null
+++ b/test/test-api.js
@@ -0,0 +1,21 @@
+'use strict';
+
+// Testcase to produce NodeReport via API call
+if (process.argv[2] === 'child') {
+  const nodereport = require('../');
+  nodereport.triggerReport();
+} else {
+  const common = require('./common.js');
+  const spawn = require('child_process').spawn;
+  const tap = require('tap');
+
+  const child = spawn(process.execPath, [__filename, 'child']);
+  child.on('exit', (code) => {
+    tap.plan(3);
+    tap.equal(code, 0, 'Process exited cleanly');
+    const reports = common.findReports(child.pid);
+    tap.equal(reports.length, 1, 'Found reports ' + reports);
+    const report = reports[0];
+    common.validate(tap, report, child.pid);
+  });
+}
diff --git a/test/test-exception.js b/test/test-exception.js
new file mode 100644
index 0000000..6fa442a
--- /dev/null
+++ b/test/test-exception.js
@@ -0,0 +1,36 @@
+'use strict';
+
+// Testcase to produce NodeReport on uncaught exception
+if (process.argv[2] === 'child') {
+  require('../').setEvents('exception');
+
+  function myException(request, response) {
+    const m = '*** exception.js: testcase exception thrown from myException()';
+    throw new UserException(m);
+  }
+
+  function UserException(message) {
+    this.message = message;
+    this.name = 'UserException';
+  }
+
+  myException();
+} else {
+  const common = require('./common.js');
+  const spawn = require('child_process').spawn;
+  const tap = require('tap');
+
+  const child = spawn(process.execPath, [__filename, 'child']);
+  child.on('exit', (code, signal) => {
+    const expectedExitCode = process.platform === 'win32' ? 0xC0000005 : null;
+    const expectedSignal = process.platform === 'win32' ? null : 'SIGILL';
+    tap.plan(4);
+    tap.equal(code, expectedExitCode, 'Process should not exit cleanly');
+    tap.equal(signal, expectedSignal,
+              'Process should exit with expected signal ');
+    const reports = common.findReports(child.pid);
+    tap.equal(reports.length, 1, 'Found reports ' + reports);
+    const report = reports[0];
+    common.validate(tap, report, child.pid);
+  });
+}
diff --git a/test/test-fatal-error.js b/test/test-fatal-error.js
new file mode 100644
index 0000000..66238eb
--- /dev/null
+++ b/test/test-fatal-error.js
@@ -0,0 +1,33 @@
+'use strict';
+
+// Testcase to produce NodeReport on fatal error (javascript heap OOM)
+if (process.argv[2] === 'child') {
+  require('../').setEvents('fatalerror');
+
+  const list = [];
+  while (true) {
+    const record = new MyRecord();
+    list.push(record);
+  }
+
+  function MyRecord() {
+    this.name = 'foo';
+    this.id = 128;
+    this.account = 98454324;
+  }
+} else {
+  const common = require('./common.js');
+  const spawn = require('child_process').spawn;
+  const tap = require('tap');
+
+  const args = ['--max-old-space-size=20', __filename, 'child'];
+  const child = spawn(process.execPath, args);
+  child.on('exit', (code) => {
+    tap.plan(3);
+    tap.notEqual(code, 0, 'Process should not exit cleanly');
+    const reports = common.findReports(child.pid);
+    tap.equal(reports.length, 1, 'Found reports ' + reports);
+    const report = reports[0];
+    common.validate(tap, report, child.pid);
+  });
+}
diff --git a/test/test-signal.js b/test/test-signal.js
new file mode 100644
index 0000000..dfd5317
--- /dev/null
+++ b/test/test-signal.js
@@ -0,0 +1,64 @@
+'use strict';
+
+// Testcase to produce NodeReport on signal interrupting a js busy-loop,
+// showing it is interruptible.
+if (process.argv[2] === 'child') {
+  require('../').setEvents('signal');
+
+  // Exit on loss of parent process
+  process.on('disconnect', () => process.exit(2));
+
+  function busyLoop() {
+    var list = [];
+    for (var i = 0; i < 1e10; i++) {
+      for (var j = 0; j < 1000; j++) {
+        list.push(new MyRecord());
+      }
+      for (var k = 0; k < 1000; k++) {
+        list[k].id += 1;
+        list[k].account += 2;
+      }
+      for (var l = 0; l < 1000; l++) {
+        list.pop();
+      }
+    }
+  }
+
+  function MyRecord() {
+    this.name = 'foo';
+    this.id = 128;
+    this.account = 98454324;
+  }
+
+  process.send('child started', busyLoop);
+} else {
+  const common = require('./common.js');
+  const fork = require('child_process').fork;
+  const tap = require('tap');
+
+  if (process.platform === 'win32') {
+    tap.fail('Unsupported on Windows', { skip: true });
+    return;
+  }
+
+  const child = fork(__filename, ['child'], { silent: true });
+  // Wait for child to indicate it is ready before sending signal
+  child.on('message', () => child.kill('SIGUSR2'));
+  var stderr = '';
+  child.stderr.on('data', (chunk) => {
+    stderr += chunk;
+    // Terminate the child after the report has been written
+    if (stderr.includes('Node.js report completed')) {
+      child.kill('SIGTERM');
+    }
+  });
+  child.on('exit', (code, signal) => {
+    tap.plan(4);
+    tap.equal(code, null, 'Process should not exit cleanly');
+    tap.equal(signal, 'SIGTERM', 'Process should exit with expected signal');
+    const reports = common.findReports(child.pid);
+    tap.equal(reports.length, 1, 'Found reports ' + reports);
+    const report = reports[0];
+    common.validate(tap, report, child.pid);
+  });
+}
diff --git a/test/test_1.js b/test/test_1.js
deleted file mode 100644
index 6d980f9..0000000
--- a/test/test_1.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// NodeReport API example
-var nodereport = require('../');
-
-console.log('api_call.js: triggering a NodeReport via API call...');
-
-function myReport() {
-  nodereport.triggerReport();
-}
-
-myReport();
diff --git a/test/test_2.js b/test/test_2.js
deleted file mode 100644
index 8f4b45d..0000000
--- a/test/test_2.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Testcase to produce an uncaught exception
-require('../').setEvents("exception");
-
-console.log('exception.js: throwing an uncaught user exception....');
-
-function myException(request, response) {
-  throw new UserException('*** exception.js: testcase exception thrown from myException()');
-}
-
-function UserException(message) {
-  this.message = message;
-  this.name = "UserException";
-}
-
-myException();
diff --git a/test/test_3.js b/test/test_3.js
deleted file mode 100644
index a04c286..0000000
--- a/test/test_3.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// Testcase to produce a fatal error (javascript heap OOM)
-require('../').setEvents("fatalerror");
-
-console.log('fatalerror.js: allocating excessive javascript heap memory....');
-var list = [];
-while (true) {
-  var record = new MyRecord();
-  list.push(record);
-}
-
-
-function MyRecord() {
-  this.name = 'foo';
-  this.id = 128;
-  this.account = 98454324;
-}
diff --git a/test/test_4.js b/test/test_4.js
deleted file mode 100644
index 4ac2bdc..0000000
--- a/test/test_4.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// Testcase to loop in Javascript code
-require('../').setEvents("signal");
-
-console.log('loop.js: going into loop now.... use kill -USR2 <pid> to trigger NodeReport');
-
-function myLoop() {
-  var list = [];
-  for (var i=0; i<10000000000; i++) {
-    for (var j=0; i<1000; i++) {
-      list.push(new MyRecord());
-    }
-    for (var j=0; i<1000; i++) {
-      list[j].id += 1;
-      list[j].account += 2;
-    }
-    for (var j=0; i<1000; i++) {
-      list.pop();
-    }
-  }
-}
-
-function MyRecord() {
-  this.name = 'foo';
-  this.id = 128;
-  this.account = 98454324;
-}
-
-myLoop();