diff --git a/test/when/when.js b/test/when/when.js
new file mode 100644
index 000000000..3ce465630
--- /dev/null
+++ b/test/when/when.js
@@ -0,0 +1,2 @@
+const when = (pred, whenTrue) => (x) => pred(x) ? whenTrue(x) : x;
+module.exports = when;
\ No newline at end of file
diff --git a/test/when/when.test.js b/test/when/when.test.js
new file mode 100644
index 000000000..1a814190f
--- /dev/null
+++ b/test/when/when.test.js
@@ -0,0 +1,18 @@
+const test = require('tape');
+const when = require('./when.js');
+
+test('Testing when', (t) => {
+  //For more information on all the methods supported by tape
+  //Please go to https://github.com/substack/tape
+  t.true(typeof when === 'function', 'when is a Function');
+
+  const doubleEvenNumbers = when(
+    (x) => x % 2 === 0,
+    (x) => x * 2
+  );
+
+  t.true(doubleEvenNumbers(2) === 4);
+  t.true(doubleEvenNumbers(1) === 1);
+
+  t.end();
+});