diff --git a/test/Math.test.js b/test/Math.test.js
new file mode 100644
index 00000000000..7378610b61c
--- /dev/null
+++ b/test/Math.test.js
@@ -0,0 +1,25 @@
+var MathMock = artifacts.require('./mocks/MathMock.sol');
+
+contract('Math', function (accounts) {
+  let math;
+
+  before(async function () {
+    math = await MathMock.new();
+  });
+
+  it('returns max correctly', async function () {
+    let a = 5678;
+    let b = 1234;
+    await math.max64(a, b);
+    let result = await math.result();
+    assert.equal(result, a);
+  });
+
+  it('returns min correctly', async function () {
+    let a = 5678;
+    let b = 1234;
+    await math.min64(a, b);
+    let result = await math.result();
+    assert.equal(result, b);
+  });
+});
diff --git a/test/mocks/MathMock.sol b/test/mocks/MathMock.sol
new file mode 100644
index 00000000000..8b6401e5756
--- /dev/null
+++ b/test/mocks/MathMock.sol
@@ -0,0 +1,17 @@
+pragma solidity ^0.4.18;
+
+
+import '../../contracts/math/Math.sol';
+
+
+contract MathMock {
+  uint64 public result;
+
+  function max64(uint64 a, uint64 b) public {
+    result = Math.max64(a, b);
+  }
+
+  function min64(uint64 a, uint64 b) public {
+    result = Math.min64(a, b);
+  }
+}