diff --git a/lib/common/defaults.js b/lib/common/defaults.js
index 4e21868..d21c079 100644
--- a/lib/common/defaults.js
+++ b/lib/common/defaults.js
@@ -32,11 +32,11 @@ Defaults.FEE_LEVELS = [{
 }, {
   name: 'normal',
   nbBlocks: 2,
-  defaultValue: 20000
+  defaultValue: 40000
 }, {
   name: 'economy',
   nbBlocks: 6,
-  defaultValue: 10000
+  defaultValue: 25000
 }];
 
 // Minimum nb of addresses a wallet must have to start using 2-step balance optimization
diff --git a/test/integration/server.js b/test/integration/server.js
index 1aa8028..7aa5166 100644
--- a/test/integration/server.js
+++ b/test/integration/server.js
@@ -1856,9 +1856,12 @@ describe('Wallet service', function() {
         fees = _.zipObject(_.map(fees, function(item) {
           return [item.level, item.feePerKb];
         }));
-        fees.priority.should.equal(50000);
-        fees.normal.should.equal(20000);
-        fees.economy.should.equal(10000);
+        var defaults = _.zipObject(_.map(Defaults.FEE_LEVELS, function(item) {
+          return [item.name, item.defaultValue];
+        }));
+        fees.priority.should.equal(defaults.priority);
+        fees.normal.should.equal(defaults.normal);
+        fees.economy.should.equal(defaults.economy);
         done();
       });
     });