diff --git a/test/token/BasicToken.test.js b/test/token/ERC20/BasicToken.test.js
similarity index 97%
rename from test/token/BasicToken.test.js
rename to test/token/ERC20/BasicToken.test.js
index 5964ed111..3e8170465 100644
--- a/test/token/BasicToken.test.js
+++ b/test/token/ERC20/BasicToken.test.js
@@ -1,4 +1,4 @@
-import assertRevert from '../helpers/assertRevert';
+import assertRevert from '../../helpers/assertRevert';
 const BasicToken = artifacts.require('BasicTokenMock');
 
 contract('StandardToken', function ([_, owner, recipient, anotherAccount]) {
diff --git a/test/token/BurnableToken.test.js b/test/token/ERC20/BurnableToken.test.js
similarity index 96%
rename from test/token/BurnableToken.test.js
rename to test/token/ERC20/BurnableToken.test.js
index 751f81207..51b7c2dd8 100644
--- a/test/token/BurnableToken.test.js
+++ b/test/token/ERC20/BurnableToken.test.js
@@ -1,4 +1,4 @@
-import assertRevert from '../helpers/assertRevert';
+import assertRevert from '../../helpers/assertRevert';
 const BurnableTokenMock = artifacts.require('BurnableTokenMock');
 
 contract('BurnableToken', function ([owner]) {
diff --git a/test/token/CappedToken.test.js b/test/token/ERC20/CappedToken.test.js
similarity index 90%
rename from test/token/CappedToken.test.js
rename to test/token/ERC20/CappedToken.test.js
index b5d64d43b..c3fa5af6b 100644
--- a/test/token/CappedToken.test.js
+++ b/test/token/ERC20/CappedToken.test.js
@@ -1,6 +1,6 @@
 
-import expectThrow from '../helpers/expectThrow';
-import ether from '../helpers/ether';
+import expectThrow from '../../helpers/expectThrow';
+import ether from '../../helpers/ether';
 
 var CappedToken = artifacts.require('CappedToken');
 
diff --git a/test/token/MintableToken.test.js b/test/token/ERC20/MintableToken.test.js
similarity index 98%
rename from test/token/MintableToken.test.js
rename to test/token/ERC20/MintableToken.test.js
index 8774b27e2..a6b2d268e 100644
--- a/test/token/MintableToken.test.js
+++ b/test/token/ERC20/MintableToken.test.js
@@ -1,4 +1,4 @@
-import assertRevert from '../helpers/assertRevert';
+import assertRevert from '../../helpers/assertRevert';
 const MintableToken = artifacts.require('MintableToken');
 
 contract('Mintable', function ([owner, anotherAccount]) {
diff --git a/test/token/PausableToken.test.js b/test/token/ERC20/PausableToken.test.js
similarity index 99%
rename from test/token/PausableToken.test.js
rename to test/token/ERC20/PausableToken.test.js
index c7d2c6bec..46e30ee33 100644
--- a/test/token/PausableToken.test.js
+++ b/test/token/ERC20/PausableToken.test.js
@@ -1,4 +1,4 @@
-import assertRevert from '../helpers/assertRevert';
+import assertRevert from '../../helpers/assertRevert';
 const PausableToken = artifacts.require('PausableTokenMock');
 
 contract('PausableToken', function ([_, owner, recipient, anotherAccount]) {
diff --git a/test/token/StandardToken.test.js b/test/token/ERC20/StandardToken.test.js
similarity index 99%
rename from test/token/StandardToken.test.js
rename to test/token/ERC20/StandardToken.test.js
index 86f4aa8b4..4d27b9dba 100644
--- a/test/token/StandardToken.test.js
+++ b/test/token/ERC20/StandardToken.test.js
@@ -1,4 +1,4 @@
-import assertRevert from '../helpers/assertRevert';
+import assertRevert from '../../helpers/assertRevert';
 const StandardTokenMock = artifacts.require('StandardTokenMock');
 
 contract('StandardToken', function ([_, owner, recipient, anotherAccount]) {
diff --git a/test/token/TokenTimelock.test.js b/test/token/ERC20/TokenTimelock.test.js
similarity index 94%
rename from test/token/TokenTimelock.test.js
rename to test/token/ERC20/TokenTimelock.test.js
index 1ce9ef298..d99c4b247 100644
--- a/test/token/TokenTimelock.test.js
+++ b/test/token/ERC20/TokenTimelock.test.js
@@ -1,5 +1,5 @@
-import latestTime from '../helpers/latestTime';
-import { increaseTimeTo, duration } from '../helpers/increaseTime';
+import latestTime from '../../helpers/latestTime';
+import { increaseTimeTo, duration } from '../../helpers/increaseTime';
 
 const BigNumber = web3.BigNumber;
 
diff --git a/test/token/TokenVesting.test.js b/test/token/ERC20/TokenVesting.test.js
similarity index 96%
rename from test/token/TokenVesting.test.js
rename to test/token/ERC20/TokenVesting.test.js
index 8487576fe..e6ce5c177 100644
--- a/test/token/TokenVesting.test.js
+++ b/test/token/ERC20/TokenVesting.test.js
@@ -1,6 +1,6 @@
-import EVMRevert from '../helpers/EVMRevert';
-import latestTime from '../helpers/latestTime';
-import { increaseTimeTo, duration } from '../helpers/increaseTime';
+import EVMRevert from '../../helpers/EVMRevert';
+import latestTime from '../../helpers/latestTime';
+import { increaseTimeTo, duration } from '../../helpers/increaseTime';
 
 const BigNumber = web3.BigNumber;