diff --git a/lib/server.js b/lib/server.js
index 07f257b..1f78f14 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -812,13 +812,13 @@ WalletService.prototype.getFeeLevels = function(opts, cb) {
     defaultValue: 20000
   }, {
     name: 'normal',
-    nbBlocks: 4,
+    nbBlocks: 6,
     modifier: 1,
     defaultValue: 10000
   }, {
     name: 'economy',
-    nbBlocks: 4,
-    modifier: 0.5,
+    nbBlocks: 25,
+    modifier: 1,
     defaultValue: 5000
   }, ];
 
diff --git a/test/integration/server.js b/test/integration/server.js
index 491a426..b896511 100644
--- a/test/integration/server.js
+++ b/test/integration/server.js
@@ -1464,15 +1464,15 @@ describe('Wallet service', function() {
     it('should get current fee levels', function(done) {
       helpers.stubFeeLevels({
         2: 40000,
-        4: 20000,
-        6: 18000,
+        6: 20000,
+        25: 18000,
       });
       server.getFeeLevels({}, function(err, fees) {
         should.not.exist(err);
         fees.emergency.should.equal(60000);
         fees.priority.should.equal(40000);
         fees.normal.should.equal(20000);
-        fees.economy.should.equal(10000);
+        fees.economy.should.equal(18000);
         done();
       });
     });
@@ -1490,14 +1490,15 @@ describe('Wallet service', function() {
     it('should get default fees if network cannot estimate (returns -1)', function(done) {
       helpers.stubFeeLevels({
         2: -1,
-        4: 18000,
+        6: 18000,
+        25: 0,
       });
       server.getFeeLevels({}, function(err, fees) {
         should.not.exist(err);
         fees.emergency.should.equal(50000);
         fees.priority.should.equal(20000);
         fees.normal.should.equal(18000);
-        fees.economy.should.equal(9000);
+        fees.economy.should.equal(5000);
         done();
       });
     });