diff --git a/common/api/shapeshift.ts b/common/api/shapeshift.ts
index ba97be59..f24ccd6f 100644
--- a/common/api/shapeshift.ts
+++ b/common/api/shapeshift.ts
@@ -21,10 +21,9 @@ export const SHAPESHIFT_TOKEN_WHITELIST = [
   'FUN',
   'RLC',
   'TRST',
-  'GUP',
-  'ETH'
+  'GUP'
 ];
-export const SHAPESHIFT_WHITELIST = [...SHAPESHIFT_TOKEN_WHITELIST, 'ETC', 'BTC'];
+export const SHAPESHIFT_WHITELIST = [...SHAPESHIFT_TOKEN_WHITELIST, 'ETH', 'ETC', 'BTC'];
 
 class ShapeshiftService {
   public whitelist = SHAPESHIFT_WHITELIST;
diff --git a/common/config/tokens/eth.json b/common/config/tokens/eth.json
index 3ed81266..37900888 100644
--- a/common/config/tokens/eth.json
+++ b/common/config/tokens/eth.json
@@ -433,5 +433,20 @@
     "address": "0xb110ec7b1dcb8fab8dedbf28f53bc63ea5bedd84",
     "symbol": "XID",
     "decimal": 8
+  },
+  {
+    "address": "0xE41d2489571d322189246DaFA5ebDe1F4699F498",
+    "symbol": "ZRX",
+    "decimal": 18
+  },
+  {
+    "address": "0x41e5560054824eA6B0732E656E3Ad64E20e94E45",
+    "symbol": "CVC",
+    "decimal": 8
+  },
+  {
+    "address": "0x0AbdAce70D3790235af448C88547603b945604ea",
+    "symbol": "DNT",
+    "decimal": 18
   }
 ]
diff --git a/spec/reducers/swap.spec.ts b/spec/reducers/swap.spec.ts
index 0ec7d1e4..c3ff7a98 100644
--- a/spec/reducers/swap.spec.ts
+++ b/spec/reducers/swap.spec.ts
@@ -8,6 +8,17 @@ import {
 import { normalize } from 'normalizr';
 import * as schema from 'reducers/swap/schema';
 import { TypeKeys } from 'actions/swap/constants';
+import tokens from 'config/tokens/eth.json';
+import { SHAPESHIFT_TOKEN_WHITELIST } from 'api/shapeshift';
+
+describe('ensure whitelist', () => {
+  const findToken = (tkn: string) => tokens.find(t => t.symbol === tkn);
+  SHAPESHIFT_TOKEN_WHITELIST.forEach(t => {
+    it(`Should find Token ${t}`, () => {
+      expect(findToken(t)).toBeTruthy();
+    });
+  });
+});
 
 describe('swap reducer', () => {
   const shapeshiftApiResponse = {