diff --git a/test/block.js b/test/block/block.js
similarity index 99%
rename from test/block.js
rename to test/block/block.js
index ba669fd0a6b..9ace66838cb 100644
--- a/test/block.js
+++ b/test/block/block.js
@@ -1,7 +1,7 @@
 'use strict';
 
-var bitcore = require('..');
-var BN = require('../lib/crypto/bn');
+var bitcore = require('../..');
+var BN = require('../../lib/crypto/bn');
 var BufferReader = bitcore.encoding.BufferReader;
 var BufferWriter = bitcore.encoding.BufferWriter;
 var BlockHeader = bitcore.BlockHeader;
@@ -15,8 +15,8 @@ var Transaction = bitcore.Transaction;
 var dataRawBlockBuffer = fs.readFileSync('test/data/blk86756-testnet.dat');
 var dataRawBlockBinary = fs.readFileSync('test/data/blk86756-testnet.dat', 'binary');
 var dataJson = fs.readFileSync('test/data/blk86756-testnet.json').toString();
-var data = require('./data/blk86756-testnet');
-var dataBlocks = require('./data/bitcoind/blocks');
+var data = require('../data/blk86756-testnet');
+var dataBlocks = require('../data/bitcoind/blocks');
 
 describe('Block', function() {
 
diff --git a/test/blockheader.js b/test/block/blockheader.js
similarity index 98%
rename from test/blockheader.js
rename to test/block/blockheader.js
index 16dbee6f3e8..a35ce642d87 100644
--- a/test/blockheader.js
+++ b/test/block/blockheader.js
@@ -1,7 +1,7 @@
 'use strict';
 
-var bitcore = require('..');
-var BN = require('../lib/crypto/bn');
+var bitcore = require('../..');
+var BN = require('../../lib/crypto/bn');
 var BufferReader = bitcore.encoding.BufferReader;
 var BufferWriter = bitcore.encoding.BufferWriter;
 
@@ -13,7 +13,7 @@ var should = require('chai').should();
 var dataRawBlockBuffer = fs.readFileSync('test/data/blk86756-testnet.dat');
 var dataRawBlockBinary = fs.readFileSync('test/data/blk86756-testnet.dat', 'binary');
 var dataRawId = '000000000b99b16390660d79fcc138d2ad0c89a0d044c4201a02bdf1f61ffa11';
-var data = require('./data/blk86756-testnet');
+var data = require('../data/blk86756-testnet');
 
 describe('BlockHeader', function() {
 
diff --git a/test/merkleblock.js b/test/block/merkleblock.js
similarity index 97%
rename from test/merkleblock.js
rename to test/block/merkleblock.js
index f2e95cab4ed..9eb573ae383 100644
--- a/test/merkleblock.js
+++ b/test/block/merkleblock.js
@@ -2,13 +2,13 @@
 
 var should = require('chai').should();
 
-var bitcore = require('..');
+var bitcore = require('../..');
 var MerkleBlock = bitcore.MerkleBlock;
 var BufferReader = bitcore.encoding.BufferReader;
 var BufferWriter = bitcore.encoding.BufferWriter;
 var Transaction = bitcore.Transaction;
-var data = require('./data/merkleblocks.js');
-var transactionVector = require('./data/tx_creation');
+var data = require('../data/merkleblocks.js');
+var transactionVector = require('../data/tx_creation');
 
 
 describe('MerkleBlock', function() {