diff --git a/test/library/ECDSA.test.js b/test/cryptography/ECDSA.test.js
similarity index 100%
rename from test/library/ECDSA.test.js
rename to test/cryptography/ECDSA.test.js
diff --git a/test/library/MerkleProof.test.js b/test/cryptography/MerkleProof.test.js
similarity index 100%
rename from test/library/MerkleProof.test.js
rename to test/cryptography/MerkleProof.test.js
diff --git a/test/token/ERC20/TokenVesting.test.js b/test/drafts/TokenVesting.test.js
similarity index 96%
rename from test/token/ERC20/TokenVesting.test.js
rename to test/drafts/TokenVesting.test.js
index 8fd767be1..37864fbca 100644
--- a/test/token/ERC20/TokenVesting.test.js
+++ b/test/drafts/TokenVesting.test.js
@@ -1,7 +1,7 @@
-const shouldFail = require('../../helpers/shouldFail');
-const time = require('../../helpers/time');
-const { ethGetBlock } = require('../../helpers/web3');
-const { ZERO_ADDRESS } = require('../../helpers/constants');
+const shouldFail = require('../helpers/shouldFail');
+const time = require('../helpers/time');
+const { ethGetBlock } = require('../helpers/web3');
+const { ZERO_ADDRESS } = require('../helpers/constants');
 
 const BigNumber = web3.BigNumber;
 
diff --git a/test/library/Math.test.js b/test/math/Math.test.js
similarity index 100%
rename from test/library/Math.test.js
rename to test/math/Math.test.js