diff --git a/test/drafts/ERC1820Implementer.test.js b/test/introspection/ERC1820Implementer.test.js
similarity index 100%
rename from test/drafts/ERC1820Implementer.test.js
rename to test/introspection/ERC1820Implementer.test.js
diff --git a/test/drafts/ERC777/ERC777.behavior.js b/test/token/ERC777/ERC777.behavior.js
similarity index 100%
rename from test/drafts/ERC777/ERC777.behavior.js
rename to test/token/ERC777/ERC777.behavior.js
diff --git a/test/drafts/ERC777/ERC777.test.js b/test/token/ERC777/ERC777.test.js
similarity index 99%
rename from test/drafts/ERC777/ERC777.test.js
rename to test/token/ERC777/ERC777.test.js
index 8d758f6f9..2e5e3ae40 100644
--- a/test/drafts/ERC777/ERC777.test.js
+++ b/test/token/ERC777/ERC777.test.js
@@ -11,7 +11,7 @@ const {
 
 const {
   shouldBehaveLikeERC20,
-} = require('../../token/ERC20/ERC20.behavior');
+} = require('../ERC20/ERC20.behavior');
 
 const ERC777 = artifacts.require('ERC777Mock');
 const ERC777SenderRecipientMock = artifacts.require('ERC777SenderRecipientMock');