diff --git a/test/pseudopattern_hunter_tests.js b/test/pseudopattern_hunter_tests.js
index dd9b922ce..80bce5b61 100644
--- a/test/pseudopattern_hunter_tests.js
+++ b/test/pseudopattern_hunter_tests.js
@@ -1,5 +1,7 @@
 "use strict";
 
+var tap = require('tap');
+
 var path = require('path');
 var pha = require('../core/lib/pseudopattern_hunter');
 var pa = require('../core/lib/pattern_assembler');
@@ -30,59 +32,57 @@ function stubPatternlab() {
   return pl;
 }
 
-exports['pseudopattern_hunter'] = {
-  'pseudpattern found and added as a pattern' : function (test) {
-    //arrange
-    var pl = stubPatternlab();
-
-    var atomPattern = new Pattern('00-test/03-styled-atom.mustache');
-    atomPattern.template = fs.readFileSync(patterns_dir + '00-test/03-styled-atom.mustache', 'utf8');
-    atomPattern.extendedTemplate = atomPattern.template;
-    atomPattern.stylePartials = pattern_assembler.find_pattern_partials_with_style_modifiers(atomPattern);
-
-    pattern_assembler.addPattern(atomPattern, pl);
-
-    //act
-    var patternCountBefore = pl.patterns.length;
-    pseudopattern_hunter.find_pseudopatterns(atomPattern, pl);
-
-    //assert
-    test.equals(patternCountBefore + 1, pl.patterns.length);
-    test.equals(pl.patterns[1].patternPartial, 'test-styled-atom-alt');
-    test.equals(pl.patterns[1].extendedTemplate.replace(/\s\s+/g, ' ').replace(/\n/g, ' ').trim(), '<span class="test_base {{styleModifier}}"> {{message}} </span>');
-    test.equals(JSON.stringify(pl.patterns[1].jsonFileData), JSON.stringify({"message": "alternateMessage"}));
-    test.equals(pl.patterns[1].patternLink, '00-test-03-styled-atom-alt' + path.sep + '00-test-03-styled-atom-alt.html');
-
-    test.done();
-  },
-
-  'pseudpattern variant includes stylePartials and parameteredPartials' : function (test) {
-    //arrange
-    var pl = stubPatternlab();
-
-    var atomPattern = new Pattern('00-test/03-styled-atom.mustache');
-    atomPattern.template = fs.readFileSync(patterns_dir + '00-test/03-styled-atom.mustache', 'utf8');
-    atomPattern.extendedTemplate = atomPattern.template;
-    atomPattern.stylePartials = atomPattern.findPartialsWithStyleModifiers(atomPattern);
-    atomPattern.parameteredPartials = atomPattern.findPartialsWithPatternParameters(atomPattern);
-
-    var pseudoPattern = new Pattern('00-test/474-pseudomodifier.mustache');
-    pseudoPattern.template = fs.readFileSync(patterns_dir + '00-test/474-pseudomodifier.mustache', 'utf8');
-    pseudoPattern.extendedTemplate = atomPattern.template;
-    pseudoPattern.stylePartials = pseudoPattern.findPartialsWithStyleModifiers(pseudoPattern);
-    pseudoPattern.parameteredPartials = pseudoPattern.findPartialsWithPatternParameters(pseudoPattern);
-
-    pattern_assembler.addPattern(atomPattern, pl);
-    pattern_assembler.addPattern(pseudoPattern, pl);
-
-    //act
-    pseudopattern_hunter.find_pseudopatterns(pseudoPattern, pl);
-
-    //assert
-    test.equals(pl.patterns[2].patternPartial, 'test-pseudomodifier-test');
-    test.equals(pl.patterns[2].stylePartials, pseudoPattern.stylePartials);
-    test.equals(pl.patterns[2].parameteredPartials, pseudoPattern.parameteredPartials);
-
-    test.done();
-  }
-};
+tap.test('pseudpattern found and added as a pattern', function (test) {
+  //arrange
+  var pl = stubPatternlab();
+
+  var atomPattern = new Pattern('00-test/03-styled-atom.mustache');
+  atomPattern.template = fs.readFileSync(patterns_dir + '00-test/03-styled-atom.mustache', 'utf8');
+  atomPattern.extendedTemplate = atomPattern.template;
+  atomPattern.stylePartials = pattern_assembler.find_pattern_partials_with_style_modifiers(atomPattern);
+
+  pattern_assembler.addPattern(atomPattern, pl);
+
+  //act
+  var patternCountBefore = pl.patterns.length;
+  pseudopattern_hunter.find_pseudopatterns(atomPattern, pl);
+
+  //assert
+  test.equals(patternCountBefore + 1, pl.patterns.length);
+  test.equals(pl.patterns[1].patternPartial, 'test-styled-atom-alt');
+  test.equals(pl.patterns[1].extendedTemplate.replace(/\s\s+/g, ' ').replace(/\n/g, ' ').trim(), '<span class="test_base {{styleModifier}}"> {{message}} </span>');
+  test.equals(JSON.stringify(pl.patterns[1].jsonFileData), JSON.stringify({"message": "alternateMessage"}));
+  test.equals(pl.patterns[1].patternLink, '00-test-03-styled-atom-alt' + path.sep + '00-test-03-styled-atom-alt.html');
+
+  test.end();
+});
+
+tap.test('pseudpattern variant includes stylePartials and parameteredPartials', function (test) {
+  //arrange
+  var pl = stubPatternlab();
+
+  var atomPattern = new Pattern('00-test/03-styled-atom.mustache');
+  atomPattern.template = fs.readFileSync(patterns_dir + '00-test/03-styled-atom.mustache', 'utf8');
+  atomPattern.extendedTemplate = atomPattern.template;
+  atomPattern.stylePartials = atomPattern.findPartialsWithStyleModifiers(atomPattern);
+  atomPattern.parameteredPartials = atomPattern.findPartialsWithPatternParameters(atomPattern);
+
+  var pseudoPattern = new Pattern('00-test/474-pseudomodifier.mustache');
+  pseudoPattern.template = fs.readFileSync(patterns_dir + '00-test/474-pseudomodifier.mustache', 'utf8');
+  pseudoPattern.extendedTemplate = atomPattern.template;
+  pseudoPattern.stylePartials = pseudoPattern.findPartialsWithStyleModifiers(pseudoPattern);
+  pseudoPattern.parameteredPartials = pseudoPattern.findPartialsWithPatternParameters(pseudoPattern);
+
+  pattern_assembler.addPattern(atomPattern, pl);
+  pattern_assembler.addPattern(pseudoPattern, pl);
+
+  //act
+  pseudopattern_hunter.find_pseudopatterns(pseudoPattern, pl);
+
+  //assert
+  test.equals(pl.patterns[2].patternPartial, 'test-pseudomodifier-test');
+  test.equals(pl.patterns[2].stylePartials, pseudoPattern.stylePartials);
+  test.equals(pl.patterns[2].parameteredPartials, pseudoPattern.parameteredPartials);
+
+  test.end();
+});