diff --git a/test/tomodex.js b/test/tomodex.js
index 2050eb9..fb96996 100644
--- a/test/tomodex.js
+++ b/test/tomodex.js
@@ -7,6 +7,7 @@ let urljoin = require('url-join')
 let BigNumber = require('bignumber.js')
 let uri = (config.tomodex || {}).uri
 let moment = require('moment')
+let pairs = []
 
 chai.use(chaiHttp)
 describe('TomoDex', () => {
@@ -29,37 +30,43 @@ describe('TomoDex', () => {
         })
     })
 
-    describe('/GET trades', () => {
+    describe('/GET pairs', () => {
         it('it should GET trades', (done) => {
-            let url = urljoin(uri, 'api/trades')
+            let url = urljoin(uri, 'api/pairs')
             chai.request(url)
                 .get('')
-                .query({
-                    baseToken: config.get('tomodex.baseToken'),
-                    quoteToken: config.get('tomodex.quoteToken'),
-                    sortType: 'desc',
-                    sortBy: 'time'
-                })
                 .end((err, res) => {
                     res.should.have.status(200)
                     res.should.be.json
-                    let trades = res.body.data.trades
-                    expect(moment().diff(trades[0].createdAt, 'seconds')).to.be.below(300)
+                    pairs = res.body.data
                     done()
                 })
         })
     })
 
-    describe('/GET pairs', () => {
+    describe('/GET trades', () => {
         it('it should GET trades', (done) => {
-            let url = urljoin(uri, 'api/pairs')
-            chai.request(url)
-                .get('')
-                .end((err, res) => {
-                    res.should.have.status(200)
-                    res.should.be.json
-                    done()
+            let url = urljoin(uri, 'api/trades')
+            let map = pairs.map((p) => {
+                return new Promise((resolve, reject) =>  {
+                    chai.request(url)
+                        .get('')
+                        .query({
+                            baseToken: p.baseTokenAddress,
+                            quoteToken: p.quoteTokenAddress,
+                            sortType: 'dec',
+                            sortBy: 'time'
+                        })
+                        .end((err, res) => {
+                            res.should.have.status(200)
+                            res.should.be.json
+                            let trades = res.body.data.trades
+                            expect(moment().diff(trades[0].createdAt, 'seconds')).to.be.below(600)
+                            return resolve()
+                        })
                 })
+            })
+            Promise.all(map).then(() => done())
         })
     })