diff --git a/app/scripts/migrations/002.js b/app/scripts/migrations/002.js
index 087f8bcd9..ab6a256ab 100644
--- a/app/scripts/migrations/002.js
+++ b/app/scripts/migrations/002.js
@@ -1,13 +1,11 @@
-var oldTestRpc = 'https://rawtestrpc.metamask.io/'
-var newTestRpc = 'https://testrpc.metamask.io/'
-
 module.exports = {
-  version: 3,
+  version: 2,
 
   migrate: function(data) {
     try {
-      if (data.config.provider.rpcTarget === oldTestRpc) {
-        data.config.provider.rpcTarget = newTestRpc
+      if (data.config.provider.type === 'etherscan') {
+        data.config.provider.type = 'rpc'
+        data.config.provider.rpcTarget = 'https://rpc.metamask.io/'
       }
     } catch (e) {}
     return data
diff --git a/app/scripts/migrations/003.js b/app/scripts/migrations/003.js
index ab6a256ab..087f8bcd9 100644
--- a/app/scripts/migrations/003.js
+++ b/app/scripts/migrations/003.js
@@ -1,11 +1,13 @@
+var oldTestRpc = 'https://rawtestrpc.metamask.io/'
+var newTestRpc = 'https://testrpc.metamask.io/'
+
 module.exports = {
-  version: 2,
+  version: 3,
 
   migrate: function(data) {
     try {
-      if (data.config.provider.type === 'etherscan') {
-        data.config.provider.type = 'rpc'
-        data.config.provider.rpcTarget = 'https://rpc.metamask.io/'
+      if (data.config.provider.rpcTarget === oldTestRpc) {
+        data.config.provider.rpcTarget = newTestRpc
       }
     } catch (e) {}
     return data