diff --git a/contracts/interfaces/ILendingPool.sol b/contracts/interfaces/ILendingPool.sol
index 83e40cd9..17be5799 100644
--- a/contracts/interfaces/ILendingPool.sol
+++ b/contracts/interfaces/ILendingPool.sol
@@ -33,13 +33,6 @@ interface ILendingPool {
    **/
   event Withdraw(address indexed reserve, address indexed user, address indexed to, uint256 amount);
 
-  event BorrowAllowanceDelegated(
-    address indexed fromUser,
-    address indexed toUser,
-    address[] assets,
-    uint256[] interestRateModes,
-    uint256[] amounts
-  );
   /**
    * @dev emitted on borrow
    * @param reserve the address of the reserve
@@ -196,27 +189,6 @@ interface ILendingPool {
     address to
   ) external;
 
-  /**
-   * @dev Sets allowance to borrow on a certain type of debt assets for a certain user address
-   * @param assets The underlying asset of each debt token
-   * @param user The user to give allowance to
-   * @param interestRateModes Types of debt: 1 for stable, 2 for variable
-   * @param amounts Allowance amounts to borrow
-   **/
-  function delegateBorrowAllowance(
-    address[] calldata assets,
-    address user,
-    uint256[] calldata interestRateModes,
-    uint256[] calldata amounts
-  ) external;
-
-  function getBorrowAllowance(
-    address fromUser,
-    address toUser,
-    address asset,
-    uint256 interestRateMode
-  ) external view returns (uint256);
-
   /**
    * @dev Allows users to borrow a specific amount of the reserve currency, provided that the borrower
    * already deposited enough collateral.
diff --git a/contracts/lendingpool/LendingPool.sol b/contracts/lendingpool/LendingPool.sol
index 4c70ca88..b2afa781 100644
--- a/contracts/lendingpool/LendingPool.sol
+++ b/contracts/lendingpool/LendingPool.sol
@@ -166,53 +166,6 @@ contract LendingPool is VersionedInitializable, ILendingPool, LendingPoolStorage
     emit Withdraw(asset, msg.sender, to, amountToWithdraw);
   }
 
-  /**
-   * @dev returns the borrow allowance of the user
-   * @param asset The underlying asset of the debt token
-   * @param fromUser The user to giving allowance
-   * @param toUser The user to give allowance to
-   * @param interestRateMode Type of debt: 1 for stable, 2 for variable
-   * @return the current allowance of toUser
-   **/
-  function getBorrowAllowance(
-    address fromUser,
-    address toUser,
-    address asset,
-    uint256 interestRateMode
-  ) external override view returns (uint256) {
-    return
-      _borrowAllowance[_reserves[asset].getDebtTokenAddress(interestRateMode)][fromUser][toUser];
-  }
-
-  /**
-   * @dev Sets allowance to borrow on a certain type of debt assets for a certain user address
-   * @param assets The underlying asset of each debt token
-   * @param user The user to give allowance to
-   * @param interestRateModes Types of debt: 1 for stable, 2 for variable
-   * @param amounts Allowance amounts to borrow
-   **/
-  function delegateBorrowAllowance(
-    address[] calldata assets,
-    address user,
-    uint256[] calldata interestRateModes,
-    uint256[] calldata amounts
-  ) external override {
-    _whenNotPaused();
-
-    uint256 countAssets = assets.length;
-    require(
-      countAssets == interestRateModes.length && countAssets == amounts.length,
-      Errors.LP_INCONSISTENT_PARAMS_LENGTH
-    );
-
-    for (uint256 i = 0; i < countAssets; i++) {
-      address debtToken = _reserves[assets[i]].getDebtTokenAddress(interestRateModes[i]);
-      _borrowAllowance[debtToken][msg.sender][user] = amounts[i];
-    }
-
-    emit BorrowAllowanceDelegated(msg.sender, user, assets, interestRateModes, amounts);
-  }
-
   /**
    * @dev Allows users to borrow a specific amount of the reserve currency, provided that the borrower
    * already deposited enough collateral.
@@ -338,6 +291,7 @@ contract LendingPool is VersionedInitializable, ILendingPool, LendingPoolStorage
       //burn stable rate tokens, mint variable rate tokens
       IStableDebtToken(reserve.stableDebtTokenAddress).burn(msg.sender, stableDebt);
       IVariableDebtToken(reserve.variableDebtTokenAddress).mint(
+        msg.sender,
         msg.sender,
         stableDebt,
         reserve.variableBorrowIndex
@@ -350,6 +304,7 @@ contract LendingPool is VersionedInitializable, ILendingPool, LendingPoolStorage
         reserve.variableBorrowIndex
       );
       IStableDebtToken(reserve.stableDebtTokenAddress).mint(
+        msg.sender,
         msg.sender,
         variableDebt,
         reserve.currentStableBorrowRate
@@ -411,6 +366,7 @@ contract LendingPool is VersionedInitializable, ILendingPool, LendingPoolStorage
 
     IStableDebtToken(address(stableDebtToken)).burn(user, stableBorrowBalance);
     IStableDebtToken(address(stableDebtToken)).mint(
+      user,
       user,
       stableBorrowBalance,
       reserve.currentStableBorrowRate
@@ -898,14 +854,6 @@ contract LendingPool is VersionedInitializable, ILendingPool, LendingPoolStorage
       oracle
     );
 
-    if (vars.onBehalfOf != msg.sender) {
-      address debtToken = reserve.getDebtTokenAddress(vars.interestRateMode);
-
-      _borrowAllowance[debtToken][vars.onBehalfOf][msg.sender] = _borrowAllowance[debtToken][vars
-        .onBehalfOf][msg.sender]
-        .sub(vars.amount, Errors.LP_BORROW_ALLOWANCE_NOT_ENOUGH);
-    }
-
     reserve.updateState();
 
     //caching the current stable borrow rate
@@ -918,12 +866,14 @@ contract LendingPool is VersionedInitializable, ILendingPool, LendingPoolStorage
       currentStableRate = reserve.currentStableBorrowRate;
 
       isFirstBorrowing = IStableDebtToken(reserve.stableDebtTokenAddress).mint(
+        vars.user,
         vars.onBehalfOf,
         vars.amount,
         currentStableRate
       );
     } else {
       isFirstBorrowing = IVariableDebtToken(reserve.variableDebtTokenAddress).mint(
+        vars.user,
         vars.onBehalfOf,
         vars.amount,
         reserve.variableBorrowIndex
diff --git a/contracts/lendingpool/LendingPoolStorage.sol b/contracts/lendingpool/LendingPoolStorage.sol
index ceeadd39..5ea45c6e 100644
--- a/contracts/lendingpool/LendingPoolStorage.sol
+++ b/contracts/lendingpool/LendingPoolStorage.sol
@@ -15,8 +15,6 @@ contract LendingPoolStorage {
 
   mapping(address => ReserveLogic.ReserveData) internal _reserves;
   mapping(address => UserConfiguration.Map) internal _usersConfig;
-  // debt token address => user who gives allowance => user who receives allowance => amount
-  mapping(address => mapping(address => mapping(address => uint256))) internal _borrowAllowance;
 
   // the list of the available reserves, structured as a mapping for gas savings reasons
   mapping(uint256 => address) internal _reservesList;
diff --git a/contracts/libraries/helpers/Errors.sol b/contracts/libraries/helpers/Errors.sol
index 1276ed23..43bf1a5b 100644
--- a/contracts/libraries/helpers/Errors.sol
+++ b/contracts/libraries/helpers/Errors.sol
@@ -19,6 +19,7 @@ pragma solidity ^0.6.8;
 library Errors {
   //common errors
   string public constant CALLER_NOT_POOL_ADMIN = '33'; // 'The caller must be the pool admin'
+  string public constant BORROW_ALLOWANCE_NOT_ENOUGH = '59'; // User borrows on behalf, but allowance are too small
 
   //contract specific errors
   string public constant VL_AMOUNT_NOT_GREATER_THAN_0 = '1'; // 'Amount must be greater than 0'
@@ -80,7 +81,6 @@ library Errors {
   string public constant AT_INVALID_MINT_AMOUNT = '56'; //invalid amount to mint
   string public constant LP_FAILED_REPAY_WITH_COLLATERAL = '57';
   string public constant AT_INVALID_BURN_AMOUNT = '58'; //invalid amount to burn
-  string public constant LP_BORROW_ALLOWANCE_NOT_ENOUGH = '59'; // User borrows on behalf, but allowance are too small
   string public constant LP_FAILED_COLLATERAL_SWAP = '60';
   string public constant LP_INVALID_EQUAL_ASSETS_TO_SWAP = '61';
   string public constant LP_REENTRANCY_NOT_ALLOWED = '62';
diff --git a/contracts/libraries/logic/ReserveLogic.sol b/contracts/libraries/logic/ReserveLogic.sol
index f3d13628..63cc0dd6 100644
--- a/contracts/libraries/logic/ReserveLogic.sol
+++ b/contracts/libraries/logic/ReserveLogic.sol
@@ -119,28 +119,6 @@ library ReserveLogic {
     return cumulated;
   }
 
-  /**
-   * @dev returns an address of the debt token used for particular interest rate mode on asset.
-   * @param reserve the reserve object
-   * @param interestRateMode - STABLE or VARIABLE from ReserveLogic.InterestRateMode enum
-   * @return an address of the corresponding debt token from reserve configuration
-   **/
-  function getDebtTokenAddress(ReserveLogic.ReserveData storage reserve, uint256 interestRateMode)
-    external
-    view
-    returns (address)
-  {
-    require(
-      ReserveLogic.InterestRateMode.STABLE == ReserveLogic.InterestRateMode(interestRateMode) ||
-        ReserveLogic.InterestRateMode.VARIABLE == ReserveLogic.InterestRateMode(interestRateMode),
-      Errors.VL_INVALID_INTEREST_RATE_MODE_SELECTED
-    );
-    return
-      ReserveLogic.InterestRateMode.STABLE == ReserveLogic.InterestRateMode(interestRateMode)
-        ? reserve.stableDebtTokenAddress
-        : reserve.variableDebtTokenAddress;
-  }
-
   /**
    * @dev Updates the liquidity cumulative index Ci and variable borrow cumulative index Bvc. Refer to the whitepaper for
    * a formal specification.
diff --git a/contracts/tokenization/StableDebtToken.sol b/contracts/tokenization/StableDebtToken.sol
index e6105dbb..89430392 100644
--- a/contracts/tokenization/StableDebtToken.sol
+++ b/contracts/tokenization/StableDebtToken.sol
@@ -16,9 +16,10 @@ contract StableDebtToken is IStableDebtToken, DebtTokenBase {
 
   uint256 public constant DEBT_TOKEN_REVISION = 0x1;
 
-  uint256 private _avgStableRate;
-  mapping(address => uint40) _timestamps;
-  uint40 _totalSupplyTimestamp;
+  uint256 internal _avgStableRate;
+  mapping(address => uint40) internal _timestamps;
+  mapping(address => uint256) internal _usersData;
+  uint40 internal _totalSupplyTimestamp;
 
   constructor(
     address pool,
@@ -95,17 +96,18 @@ contract StableDebtToken is IStableDebtToken, DebtTokenBase {
    **/
   function mint(
     address user,
+    address onBehalfOf,
     uint256 amount,
     uint256 rate
   ) external override onlyLendingPool returns (bool) {
     MintLocalVars memory vars;
 
+    if (user != onBehalfOf) {
+      _decreaseBorrowAllowance(onBehalfOf, user, amount);
+    }
+
     //cumulates the user debt
-    (
-      uint256 previousBalance,
-      uint256 currentBalance,
-      uint256 balanceIncrease
-    ) = _calculateBalanceIncrease(user);
+    (, uint256 currentBalance, uint256 balanceIncrease) = _calculateBalanceIncrease(onBehalfOf);
 
     //accrueing the interest accumulation to the stored total supply and caching it
     vars.previousSupply = totalSupply();
@@ -115,17 +117,17 @@ contract StableDebtToken is IStableDebtToken, DebtTokenBase {
     vars.amountInRay = amount.wadToRay();
 
     //calculates the new stable rate for the user
-    vars.newStableRate = _usersData[user]
+    vars.newStableRate = _usersData[onBehalfOf]
       .rayMul(currentBalance.wadToRay())
       .add(vars.amountInRay.rayMul(rate))
       .rayDiv(currentBalance.add(amount).wadToRay());
 
     require(vars.newStableRate < (1 << 128), 'Debt token: stable rate overflow');
-    _usersData[user] = vars.newStableRate;
+    _usersData[onBehalfOf] = vars.newStableRate;
 
     //updating the user and supply timestamp
     //solium-disable-next-line
-    _totalSupplyTimestamp = _timestamps[user] = uint40(block.timestamp);
+    _totalSupplyTimestamp = _timestamps[onBehalfOf] = uint40(block.timestamp);
 
     //calculates the updated average stable rate
     vars.currentAvgStableRate = _avgStableRate = vars
@@ -134,13 +136,14 @@ contract StableDebtToken is IStableDebtToken, DebtTokenBase {
       .add(rate.rayMul(vars.amountInRay))
       .rayDiv(vars.nextSupply.wadToRay());
 
-    _mint(user, amount.add(balanceIncrease), vars.previousSupply);
+    _mint(onBehalfOf, amount.add(balanceIncrease), vars.previousSupply);
 
     // transfer event to track balances
-    emit Transfer(address(0), user, amount);
+    emit Transfer(address(0), onBehalfOf, amount);
 
     emit Mint(
       user,
+      onBehalfOf,
       amount,
       currentBalance,
       balanceIncrease,
@@ -158,11 +161,7 @@ contract StableDebtToken is IStableDebtToken, DebtTokenBase {
    * @param amount the amount of debt tokens to mint
    **/
   function burn(address user, uint256 amount) external override onlyLendingPool {
-    (
-      uint256 previousBalance,
-      uint256 currentBalance,
-      uint256 balanceIncrease
-    ) = _calculateBalanceIncrease(user);
+    (, uint256 currentBalance, uint256 balanceIncrease) = _calculateBalanceIncrease(user);
 
     uint256 previousSupply = totalSupply();
     uint256 newStableRate = 0;
diff --git a/contracts/tokenization/VariableDebtToken.sol b/contracts/tokenization/VariableDebtToken.sol
index 6f16082b..ef429b53 100644
--- a/contracts/tokenization/VariableDebtToken.sol
+++ b/contracts/tokenization/VariableDebtToken.sol
@@ -55,17 +55,22 @@ contract VariableDebtToken is DebtTokenBase, IVariableDebtToken {
    **/
   function mint(
     address user,
+    address onBehalfOf,
     uint256 amount,
     uint256 index
   ) external override onlyLendingPool returns (bool) {
-    uint256 previousBalance = super.balanceOf(user);
+    if (user != onBehalfOf) {
+      _decreaseBorrowAllowance(onBehalfOf, user, amount);
+    }
+
+    uint256 previousBalance = super.balanceOf(onBehalfOf);
     uint256 amountScaled = amount.rayDiv(index);
     require(amountScaled != 0, Errors.AT_INVALID_MINT_AMOUNT);
 
-    _mint(user, amountScaled);
+    _mint(onBehalfOf, amountScaled);
 
-    emit Transfer(address(0), user, amount);
-    emit Mint(user, amount, index);
+    emit Transfer(address(0), onBehalfOf, amount);
+    emit Mint(user, onBehalfOf, amount, index);
 
     return previousBalance == 0;
   }
diff --git a/contracts/tokenization/base/DebtTokenBase.sol b/contracts/tokenization/base/DebtTokenBase.sol
index 723bb5d2..b1b9963c 100644
--- a/contracts/tokenization/base/DebtTokenBase.sol
+++ b/contracts/tokenization/base/DebtTokenBase.sol
@@ -15,9 +15,17 @@ import {Errors} from '../../libraries/helpers/Errors.sol';
  */
 
 abstract contract DebtTokenBase is IncentivizedERC20, VersionedInitializable {
+  event BorrowAllowanceDelegated(
+    address indexed fromUser,
+    address indexed toUser,
+    address asset,
+    uint256 amount
+  );
+
   address public immutable UNDERLYING_ASSET_ADDRESS;
   ILendingPool public immutable POOL;
-  mapping(address => uint256) internal _usersData;
+
+  mapping(address => mapping(address => uint256)) internal _borrowAllowances;
 
   /**
    * @dev Only lending pool can call functions marked by this modifier
@@ -58,6 +66,28 @@ abstract contract DebtTokenBase is IncentivizedERC20, VersionedInitializable {
     _setDecimals(decimals);
   }
 
+  /**
+   * @dev delegates borrowing power to a user on the specific debt token
+   * @param delegatee the address receiving the delegated borrowing power
+   * @param amount the maximum amount being delegated. Delegation will still
+   * respect the liquidation constraints (even if delegated, a delegatee cannot
+   * force a delegator HF to go below 1)
+   **/
+  function approveDelegation(address delegatee, uint256 amount) external {
+    _borrowAllowances[_msgSender()][delegatee] = amount;
+    emit BorrowAllowanceDelegated(_msgSender(), delegatee, UNDERLYING_ASSET_ADDRESS, amount);
+  }
+
+  /**
+   * @dev returns the borrow allowance of the user
+   * @param fromUser The user to giving allowance
+   * @param toUser The user to give allowance to
+   * @return the current allowance of toUser
+   **/
+  function borrowAllowance(address fromUser, address toUser) external view returns (uint256) {
+    return _borrowAllowances[fromUser][toUser];
+  }
+
   /**
    * @dev Being non transferrable, the debt token does not implement any of the
    * standard ERC20 functions for transfer and allowance.
@@ -118,4 +148,19 @@ abstract contract DebtTokenBase is IncentivizedERC20, VersionedInitializable {
     subtractedValue;
     revert('ALLOWANCE_NOT_SUPPORTED');
   }
+
+  function _decreaseBorrowAllowance(
+    address delegator,
+    address delegatee,
+    uint256 amount
+  ) internal {
+    uint256 newAllowance = _borrowAllowances[delegator][delegatee].sub(
+      amount,
+      Errors.BORROW_ALLOWANCE_NOT_ENOUGH
+    );
+
+    _borrowAllowances[delegator][delegatee] = newAllowance;
+
+    emit BorrowAllowanceDelegated(delegator, delegatee, UNDERLYING_ASSET_ADDRESS, newAllowance);
+  }
 }
diff --git a/contracts/tokenization/interfaces/IAToken.sol b/contracts/tokenization/interfaces/IAToken.sol
index 055e3f5d..13cf6cb7 100644
--- a/contracts/tokenization/interfaces/IAToken.sol
+++ b/contracts/tokenization/interfaces/IAToken.sol
@@ -5,6 +5,27 @@ import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';
 import {IScaledBalanceToken} from './IScaledBalanceToken.sol';
 
 interface IAToken is IERC20, IScaledBalanceToken {
+  /**
+   * @dev emitted after the mint action
+   * @param from the address performing the mint
+   * @param value the amount to be minted
+   * @param index the last index of the reserve
+   **/
+  event Mint(address indexed from, uint256 value, uint256 index);
+
+  /**
+   * @dev mints aTokens to user
+   * only lending pools can call this function
+   * @param user the address receiving the minted tokens
+   * @param amount the amount of tokens to mint
+   * @param index the liquidity index
+   */
+  function mint(
+    address user,
+    uint256 amount,
+    uint256 index
+  ) external returns (bool);
+
   /**
    * @dev emitted after aTokens are burned
    * @param from the address performing the redeem
diff --git a/contracts/tokenization/interfaces/IScaledBalanceToken.sol b/contracts/tokenization/interfaces/IScaledBalanceToken.sol
index 604706c2..ee1a132c 100644
--- a/contracts/tokenization/interfaces/IScaledBalanceToken.sol
+++ b/contracts/tokenization/interfaces/IScaledBalanceToken.sol
@@ -2,27 +2,6 @@
 pragma solidity ^0.6.8;
 
 interface IScaledBalanceToken {
-  /**
-   * @dev emitted after the mint action
-   * @param from the address performing the mint
-   * @param value the amount to be minted
-   * @param index the last index of the reserve
-   **/
-  event Mint(address indexed from, uint256 value, uint256 index);
-
-  /**
-   * @dev mints aTokens to user
-   * only lending pools can call this function
-   * @param user the address receiving the minted tokens
-   * @param amount the amount of tokens to mint
-   * @param index the liquidity index
-   */
-  function mint(
-    address user,
-    uint256 amount,
-    uint256 index
-  ) external returns (bool);
-
   /**
    * @dev returns the principal balance of the user. The principal balance is the last
    * updated stored balance, which does not consider the perpetually accruing interest.
diff --git a/contracts/tokenization/interfaces/IStableDebtToken.sol b/contracts/tokenization/interfaces/IStableDebtToken.sol
index 81c1b586..af71aab2 100644
--- a/contracts/tokenization/interfaces/IStableDebtToken.sol
+++ b/contracts/tokenization/interfaces/IStableDebtToken.sol
@@ -15,7 +15,8 @@ pragma solidity ^0.6.8;
 interface IStableDebtToken {
   /**
    * @dev emitted when new stable debt is minted
-   * @param user the address of the user
+   * @param user the address of the user who triggered the minting
+   * @param onBehalfOf the address of the user
    * @param amount the amount minted
    * @param currentBalance the current balance of the user
    * @param balanceIncrease the the increase in balance since the last action of the user
@@ -25,6 +26,7 @@ interface IStableDebtToken {
    **/
   event Mint(
     address indexed user,
+    address indexed onBehalfOf,
     uint256 amount,
     uint256 currentBalance,
     uint256 balanceIncrease,
@@ -60,6 +62,7 @@ interface IStableDebtToken {
    **/
   function mint(
     address user,
+    address onBehalfOf,
     uint256 amount,
     uint256 rate
   ) external returns (bool);
diff --git a/contracts/tokenization/interfaces/IVariableDebtToken.sol b/contracts/tokenization/interfaces/IVariableDebtToken.sol
index f1988be8..c01b50ce 100644
--- a/contracts/tokenization/interfaces/IVariableDebtToken.sol
+++ b/contracts/tokenization/interfaces/IVariableDebtToken.sol
@@ -9,6 +9,29 @@ import {IScaledBalanceToken} from './IScaledBalanceToken.sol';
  * @notice defines the basic interface for a variable debt token.
  **/
 interface IVariableDebtToken is IScaledBalanceToken {
+  /**
+   * @dev emitted after the mint action
+   * @param from the address performing the mint
+   * @param onBehalfOf the address of the user on which behalf minting has been performed
+   * @param value the amount to be minted
+   * @param index the last index of the reserve
+   **/
+  event Mint(address indexed from, address indexed onBehalfOf, uint256 value, uint256 index);
+
+  /**
+   * @dev mints aTokens to user
+   * only lending pools can call this function
+   * @param user the address receiving the minted tokens
+   * @param amount the amount of tokens to mint
+   * @param index the liquidity index
+   */
+  function mint(
+    address user,
+    address onBehalfOf,
+    uint256 amount,
+    uint256 index
+  ) external returns (bool);
+
   /**
    * @dev emitted when variable debt is burnt
    * @param user the user which debt has been burned
diff --git a/specs/harness/LendingPoolHarnessForVariableDebtToken.sol b/specs/harness/LendingPoolHarnessForVariableDebtToken.sol
index a6ffb6f2..f5ea9be1 100644
--- a/specs/harness/LendingPoolHarnessForVariableDebtToken.sol
+++ b/specs/harness/LendingPoolHarnessForVariableDebtToken.sol
@@ -8,6 +8,9 @@ import {UserConfiguration} from '../../contracts/libraries/configuration/UserCon
 import {ReserveLogic} from '../../contracts/libraries/logic/ReserveLogic.sol';
 import {ILendingPool} from '../../contracts/interfaces/ILendingPool.sol';
 import {LendingPool} from '../../contracts/lendingpool/LendingPool.sol';
+import {
+  ILendingPoolAddressesProvider
+} from '../../contracts/interfaces/ILendingPoolAddressesProvider.sol';
 
 /*
 Certora: Harness that delegates calls to the original LendingPool.
@@ -25,26 +28,12 @@ contract LendingPoolHarnessForVariableDebtToken is ILendingPool {
     originalPool.deposit(asset, amount, onBehalfOf, referralCode);
   }
 
-  function withdraw(address asset, uint256 amount) external override {
-    originalPool.withdraw(asset, amount);
-  }
-
-  function getBorrowAllowance(
-    address fromUser,
-    address toUser,
+  function withdraw(
     address asset,
-    uint256 interestRateMode
-  ) external override view returns (uint256) {
-    return originalPool.getBorrowAllowance(fromUser, toUser, asset, interestRateMode);
-  }
-
-  function delegateBorrowAllowance(
-    address asset,
-    address user,
-    uint256 interestRateMode,
-    uint256 amount
+    uint256 amount,
+    address to
   ) external override {
-    originalPool.delegateBorrowAllowance(asset, user, interestRateMode, amount);
+    originalPool.withdraw(asset, amount, to);
   }
 
   function borrow(
@@ -193,12 +182,12 @@ contract LendingPoolHarnessForVariableDebtToken is ILendingPool {
     address receiver,
     address[] calldata assets,
     uint256[] calldata amounts,
-    uint256 mode,
+    uint256[] calldata modes,
     address onBehalfOf,
     bytes calldata params,
     uint16 referralCode
   ) external override {
-    originalPool.flashLoan(receiver, assets, amounts, mode, onBehalfOf, params, referralCode);
+    originalPool.flashLoan(receiver, assets, amounts, modes, onBehalfOf, params, referralCode);
   }
 
   function finalizeTransfer(
@@ -211,4 +200,8 @@ contract LendingPoolHarnessForVariableDebtToken is ILendingPool {
   ) external override {
     originalPool.finalizeTransfer(asset, from, to, amount, balanceFromAfter, balanceToBefore);
   }
+
+  function getAddressesProvider() external override view returns (ILendingPoolAddressesProvider) {
+    return originalPool.getAddressesProvider();
+  }
 }
diff --git a/test/flashloan.spec.ts b/test/flashloan.spec.ts
index 887479a8..b5978d1a 100644
--- a/test/flashloan.spec.ts
+++ b/test/flashloan.spec.ts
@@ -454,10 +454,12 @@ makeSuite('LendingPool FlashLoan function', (testEnv: TestEnv) => {
 
     const flashAmount = ethers.utils.parseEther('0.8');
 
+    const reserveData = await pool.getReserveData(weth.address);
+
+    const stableDebtToken = await getVariableDebtToken(reserveData.stableDebtTokenAddress);
+
     // Deposited for onBehalfOf user already, delegate borrow allowance
-    await pool
-      .connect(onBehalfOf.signer)
-      .delegateBorrowAllowance([weth.address], caller.address, [1], [flashAmount]);
+    await stableDebtToken.connect(onBehalfOf.signer).approveDelegation(caller.address, flashAmount);
 
     await _mockFlashLoanReceiver.setFailExecutionTransfer(true);
 
diff --git a/test/helpers/actions.ts b/test/helpers/actions.ts
index d998962b..e44fc07f 100644
--- a/test/helpers/actions.ts
+++ b/test/helpers/actions.ts
@@ -18,7 +18,12 @@ import {
 import {getReserveAddressFromSymbol, getReserveData, getUserData} from './utils/helpers';
 
 import {convertToCurrencyDecimals} from '../../helpers/contracts-helpers';
-import {getAToken, getMintableErc20} from '../../helpers/contracts-getters';
+import {
+  getAToken,
+  getMintableErc20,
+  getStableDebtToken,
+  getVariableDebtToken,
+} from '../../helpers/contracts-getters';
 import {MAX_UINT_AMOUNT, ONE_YEAR} from '../../helpers/constants';
 import {SignerWithAddress, TestEnv} from './make-suite';
 import {BRE, increaseTime, timeLatest, waitForTx} from '../../helpers/misc-utils';
@@ -277,9 +282,9 @@ export const withdraw = async (
 };
 
 export const delegateBorrowAllowance = async (
-  reserveSymbols: string[],
-  amounts: string[],
-  interestRateModes: string[],
+  reserve: string,
+  amount: string,
+  interestRateMode: string,
   user: SignerWithAddress,
   receiver: tEthereumAddress,
   expectedResult: string,
@@ -288,32 +293,33 @@ export const delegateBorrowAllowance = async (
 ) => {
   const {pool} = testEnv;
 
-  const reserves: tEthereumAddress[] = [];
-  const amountsToDelegate: tEthereumAddress[] = [];
-  for (const reserveSymbol of reserveSymbols) {
-    const newLength = reserves.push(await getReserveAddressFromSymbol(reserveSymbol));
-    amountsToDelegate.push(
-      await (
-        await convertToCurrencyDecimals(reserves[newLength - 1], amounts[newLength - 1])
-      ).toString()
-    );
-  }
+  const reserveAddress: tEthereumAddress = await getReserveAddressFromSymbol(reserve);
 
-  const delegateAllowancePromise = pool
+  const amountToDelegate: string = await (
+    await convertToCurrencyDecimals(reserveAddress, amount)
+  ).toString();
+
+  const reserveData = await pool.getReserveData(reserveAddress);
+
+  const debtToken =
+    interestRateMode === '1'
+      ? await getStableDebtToken(reserveData.stableDebtTokenAddress)
+      : await getVariableDebtToken(reserveData.variableDebtTokenAddress);
+
+  const delegateAllowancePromise = debtToken
     .connect(user.signer)
-    .delegateBorrowAllowance(reserves, receiver, interestRateModes, amountsToDelegate);
-  if (expectedResult === 'revert') {
-    await expect(delegateAllowancePromise, revertMessage).to.be.reverted;
+    .approveDelegation(receiver, amountToDelegate);
+
+  if (expectedResult === 'revert' && revertMessage) {
+    await expect(delegateAllowancePromise, revertMessage).to.be.revertedWith(revertMessage);
     return;
   } else {
     await delegateAllowancePromise;
-    for (const [i, reserve] of reserves.entries()) {
-      expect(
-        (
-          await pool.getBorrowAllowance(user.address, receiver, reserve, interestRateModes[i])
-        ).toString()
-      ).to.be.equal(amountsToDelegate[i], 'borrowAllowance are set incorrectly');
-    }
+    const allowance = await debtToken.borrowAllowance(user.address, receiver);
+    expect(allowance.toString()).to.be.equal(
+      amountToDelegate,
+      'borrowAllowance is set incorrectly'
+    );
   }
 };
 
diff --git a/test/helpers/scenario-engine.ts b/test/helpers/scenario-engine.ts
index fe2e302a..bb4f82f8 100644
--- a/test/helpers/scenario-engine.ts
+++ b/test/helpers/scenario-engine.ts
@@ -121,9 +121,9 @@ const executeAction = async (action: Action, users: SignerWithAddress[], testEnv
         }
 
         await delegateBorrowAllowance(
-          [reserve],
-          [amount],
-          [rateMode],
+          reserve,
+          amount,
+          rateMode,
           user,
           toUser,
           expected,
diff --git a/test/helpers/scenarios/credit-delegation.json b/test/helpers/scenarios/credit-delegation.json
index a67924ee..a0aecf1b 100644
--- a/test/helpers/scenarios/credit-delegation.json
+++ b/test/helpers/scenarios/credit-delegation.json
@@ -68,7 +68,7 @@
             "borrowRateMode": "stable"
           },
           "expected": "revert",
-          "revertMessage": "54"
+          "revertMessage": "59"
         }
       ]
     },
@@ -96,7 +96,7 @@
             "borrowRateMode": "variable"
           },
           "expected": "revert",
-          "revertMessage": "54"
+          "revertMessage": "59"
         }
       ]
     },
@@ -126,23 +126,6 @@
           "expected": "success"
         }
       ]
-    },
-    {
-      "description": "User 0 delegates borrowing of 1 WETH to user 2 with wrong borrowRateMode, revert expected",
-      "actions": [
-        {
-          "name": "delegateBorrowAllowance",
-          "args": {
-            "reserve": "WETH",
-            "amount": "1",
-            "user": "0",
-            "borrowRateMode": "random",
-            "toUser": "2"
-          },
-          "expected": "revert",
-          "revertMessage": "8"
-        }
-      ]
     }
   ]
 }
diff --git a/test/pausable-functions.spec.ts b/test/pausable-functions.spec.ts
index 5d88ac4b..56278f66 100644
--- a/test/pausable-functions.spec.ts
+++ b/test/pausable-functions.spec.ts
@@ -122,23 +122,6 @@ makeSuite('Pausable Pool', (testEnv: TestEnv) => {
     await configurator.connect(users[1].signer).setPoolPause(false);
   });
 
-  it('DelegateBorrowAllowance', async () => {
-    const {pool, dai, users, configurator} = testEnv;
-
-    const user = users[1];
-    const toUser = users[2];
-    // Pause the pool
-    await configurator.connect(users[1].signer).setPoolPause(true);
-
-    // Try to execute liquidation
-    await expect(
-      pool.connect(user.signer).delegateBorrowAllowance([dai.address], toUser.address, ['1'], ['1'])
-    ).revertedWith(LP_IS_PAUSED);
-
-    // Unpause the pool
-    await configurator.connect(users[1].signer).setPoolPause(false);
-  });
-
   it('Borrow', async () => {
     const {pool, dai, users, configurator} = testEnv;
 
diff --git a/test/stable-token.spec.ts b/test/stable-token.spec.ts
index 02348d8b..fecc3e78 100644
--- a/test/stable-token.spec.ts
+++ b/test/stable-token.spec.ts
@@ -16,9 +16,9 @@ makeSuite('Stable debt token tests', (testEnv: TestEnv) => {
 
     const stableDebtContract = await getStableDebtToken(daiStableDebtTokenAddress);
 
-    await expect(stableDebtContract.mint(deployer.address, '1', '1')).to.be.revertedWith(
-      AT_CALLER_MUST_BE_LENDING_POOL
-    );
+    await expect(
+      stableDebtContract.mint(deployer.address, deployer.address, '1', '1')
+    ).to.be.revertedWith(AT_CALLER_MUST_BE_LENDING_POOL);
   });
 
   it('Tries to invoke burn not being the LendingPool', async () => {
diff --git a/test/variable-debt-token.spec.ts b/test/variable-debt-token.spec.ts
index 5e21f939..6c177096 100644
--- a/test/variable-debt-token.spec.ts
+++ b/test/variable-debt-token.spec.ts
@@ -15,9 +15,9 @@ makeSuite('Variable debt token tests', (testEnv: TestEnv) => {
 
     const variableDebtContract = await getVariableDebtToken(daiVariableDebtTokenAddress);
 
-    await expect(variableDebtContract.mint(deployer.address, '1', '1')).to.be.revertedWith(
-      AT_CALLER_MUST_BE_LENDING_POOL
-    );
+    await expect(
+      variableDebtContract.mint(deployer.address, deployer.address, '1', '1')
+    ).to.be.revertedWith(AT_CALLER_MUST_BE_LENDING_POOL);
   });
 
   it('Tries to invoke burn not being the LendingPool', async () => {