diff --git a/contracts/hardhat.config.js b/contracts/hardhat.config.js
index 0efb7afbbf..d6855321da 100644
--- a/contracts/hardhat.config.js
+++ b/contracts/hardhat.config.js
@@ -5,6 +5,7 @@ require("@nomiclabs/hardhat-solhint");
 require("hardhat-deploy");
 require("hardhat-contract-sizer");
 require("hardhat-deploy-ethers");
+require('@openzeppelin/hardhat-upgrades');
 
 const { accounts, fund, mint } = require("./tasks/account");
 const { debug } = require("./tasks/debug");
diff --git a/contracts/package.json b/contracts/package.json
index cbb40ac44a..4141a7aa4c 100644
--- a/contracts/package.json
+++ b/contracts/package.json
@@ -30,6 +30,7 @@
     "@nomiclabs/hardhat-ethers": "^2.0.0",
     "@nomiclabs/hardhat-solhint": "^2.0.0",
     "@nomiclabs/hardhat-waffle": "^2.0.0",
+    "@openzeppelin/hardhat-upgrades": "^1.6.0",
     "@openzeppelin/contracts": "2.5.0",
     "@openzeppelin/upgrades": "^2.8.0",
     "@openzeppelin/upgrades-core": "^1.5.0",
diff --git a/contracts/tasks/storageSlots.js b/contracts/tasks/storageSlots.js
index 0cdf08f6bc..03e28f979b 100644
--- a/contracts/tasks/storageSlots.js
+++ b/contracts/tasks/storageSlots.js
@@ -11,7 +11,6 @@ const {
   assertStorageUpgradeSafe
 } = require('@openzeppelin/upgrades-core');
 const isFork = process.env.FORK === "true";
-const isTest = process.env.IS_TEST === "true";
 
 const getStorageFileLocation = (hre, contractName) => {
   const isLocalhost = !isFork && hre.network.name === "localhost";
@@ -108,14 +107,6 @@ const assertStorageLayoutChangeSafe = async (taskArguments, hre) => {
 }
 
 const assertUpgradeIsSafe = async (hre, contractName) => {
-  /*
-   * Reading validation cache on CI is failing (but not locally when running tests). Disabling this
-   * functionality in test env for now.
-   */
-  if (isTest) {
-    return true
-  }
-
   if (!isContractEligible(contractName)) {
     console.warn(`Skipping storage slot validation of ${contractName}.`)
     return true
diff --git a/contracts/yarn.lock b/contracts/yarn.lock
index d40da8462e..55d05e893b 100644
--- a/contracts/yarn.lock
+++ b/contracts/yarn.lock
@@ -524,6 +524,13 @@
   resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-2.5.0.tgz#e327a98ba1d26b7756ff62885a0aa0967a375449"
   integrity sha512-t3jm8FrhL9tkkJTofkznTqo/XXdHi21w5yXwalEnaMOp22ZwZ0f/mmKdlgMMLPFa6bSVHbY88mKESwJT/7m5Lg==
 
+"@openzeppelin/hardhat-upgrades@^1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@openzeppelin/hardhat-upgrades/-/hardhat-upgrades-1.6.0.tgz#735e1c70aea859e284937995e238fcfdea7b69d7"
+  integrity sha512-4oRB5lH3d5RAUIWKX5wuJvgo06IOgndUoPKYUuLTKW2BmyrMTPc6GZycKf7UCxU0GYeUC9BjsohUAIjqJwMnww==
+  dependencies:
+    "@openzeppelin/upgrades-core" "^1.5.0"
+
 "@openzeppelin/upgrades-core@^1.5.0":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/@openzeppelin/upgrades-core/-/upgrades-core-1.5.0.tgz#0dc3ddc5386dfd769b46713c902de9f0e8a59d5d"