diff --git a/test/DocumentStoreUpgradeable.t.sol b/test/DocumentStoreUpgradeable.t.sol
new file mode 100644
index 0000000..666a59a
--- /dev/null
+++ b/test/DocumentStoreUpgradeable.t.sol
@@ -0,0 +1,83 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.23 <0.9.0;
+
+import "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
+import {CommonTest} from "./CommonTest.t.sol";
+import "../src/upgradeables/DocumentStoreUpgradeable.sol";
+
+contract DocumentStoreUpgradeable_Test is CommonTest {
+  DocumentStoreUpgradeable public dsProxy;
+  DocumentStoreUpgradeable public documentStore;
+
+  string public implName = "ImplDocumentStore";
+  address public implOwner = vm.addr(99);
+
+  string public initialName = "DocumentStore";
+
+  function setUp() public override {
+    super.setUp();
+
+    bytes memory initData = abi.encodeCall(DocumentStoreUpgradeable.initialize, (initialName, owner));
+
+    documentStore = new DocumentStoreUpgradeable(implName, implOwner);
+    ERC1967Proxy proxy = new ERC1967Proxy(address(documentStore), initData);
+    dsProxy = DocumentStoreUpgradeable(address(proxy));
+  }
+
+  function testImplInitializedValues() public {
+    assertEq(documentStore.name(), implName);
+    assertTrue(documentStore.hasRole(documentStore.DEFAULT_ADMIN_ROLE(), implOwner));
+  }
+
+  function testImplReinitialiseFail() public {
+    vm.expectRevert(abi.encodeWithSelector(Initializable.InvalidInitialization.selector));
+
+    documentStore.initialize("NewName", owner);
+  }
+
+  function testInitializeValues() public {
+    assertEq(dsProxy.name(), initialName);
+    assertTrue(dsProxy.hasRole(documentStore.DEFAULT_ADMIN_ROLE(), owner));
+  }
+
+  function testFailReinitialize() public {
+    dsProxy.initialize("NewName", owner);
+  }
+
+  function testUpgradeToAndCallAsNonAdmin() public {
+    address nonAdmin = vm.addr(69);
+    address newImplementation = address(new DocumentStoreUpgradeable("NewImplDocumentStore", owner));
+
+    vm.expectRevert(
+      abi.encodeWithSelector(
+        IAccessControl.AccessControlUnauthorizedAccount.selector,
+        nonAdmin,
+        documentStore.DEFAULT_ADMIN_ROLE()
+      )
+    );
+
+    vm.prank(nonAdmin);
+    dsProxy.upgradeToAndCall(newImplementation, "");
+  }
+
+  function testUpgradeToAndCallAsAdmin() public {
+    address newImplementation = address(new DocumentStoreUpgradeable("TestName", owner));
+
+    vm.prank(owner);
+    dsProxy.upgradeToAndCall(newImplementation, "");
+
+    bytes32 proxyImpl = vm.load(address(dsProxy), 0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc);
+
+    assertEq(newImplementation, address(uint160(uint256(proxyImpl))));
+  }
+
+  function testUpgradeToAndCallReinitialiseFail() public {
+    address newImplementation = address(new DocumentStoreUpgradeable("TestName", owner));
+    bytes memory initData = abi.encodeCall(DocumentStoreUpgradeable.initialize, (initialName, owner));
+
+    vm.expectRevert(abi.encodeWithSelector(Initializable.InvalidInitialization.selector));
+
+    vm.prank(owner);
+    dsProxy.upgradeToAndCall(newImplementation, initData);
+  }
+}
diff --git a/test/OwnableDocumentStoreUpgradeable.t.sol b/test/OwnableDocumentStoreUpgradeable.t.sol
new file mode 100644
index 0000000..9021655
--- /dev/null
+++ b/test/OwnableDocumentStoreUpgradeable.t.sol
@@ -0,0 +1,93 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.8.23 <0.9.0;
+
+import "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
+import {CommonTest} from "./CommonTest.t.sol";
+import "../src/upgradeables/OwnableDocumentStoreUpgradeable.sol";
+
+contract OwnableDocumentStoreUpgradeable_Test is CommonTest {
+  OwnableDocumentStoreUpgradeable public dsProxy;
+  OwnableDocumentStoreUpgradeable public documentStore;
+
+  string public implName = "ImplOwnableDocumentStore";
+  string public implSymbol = "ImplTEST";
+  address public implOwner = vm.addr(99);
+
+  string public initialName = "OwnableDocumentStore";
+  string public initialSymbol = "TEST";
+
+  function setUp() public override {
+    super.setUp();
+
+    bytes memory initData = abi.encodeCall(
+      OwnableDocumentStoreUpgradeable.initialize,
+      (initialName, initialSymbol, owner)
+    );
+
+    documentStore = new OwnableDocumentStoreUpgradeable(implName, implSymbol, implOwner);
+    ERC1967Proxy proxy = new ERC1967Proxy(address(documentStore), initData);
+    dsProxy = OwnableDocumentStoreUpgradeable(address(proxy));
+  }
+
+  function testImplInitializedValues() public {
+    assertEq(documentStore.name(), implName);
+    assertEq(documentStore.symbol(), implSymbol);
+    assertTrue(documentStore.hasRole(documentStore.DEFAULT_ADMIN_ROLE(), implOwner));
+  }
+
+  function testImplReinitialiseFail() public {
+    vm.expectRevert(abi.encodeWithSelector(Initializable.InvalidInitialization.selector));
+
+    documentStore.initialize("NewName", "TEST2", owner);
+  }
+
+  function testInitializeValues() public {
+    assertEq(dsProxy.name(), initialName);
+    assertEq(dsProxy.symbol(), initialSymbol);
+    assertTrue(dsProxy.hasRole(documentStore.DEFAULT_ADMIN_ROLE(), owner));
+  }
+
+  function testFailReinitialize() public {
+    dsProxy.initialize("NewName", "TEST2", owner);
+  }
+
+  function testUpgradeToAndCallAsNonAdmin() public {
+    address nonAdmin = vm.addr(69);
+    address newImplementation = address(new OwnableDocumentStoreUpgradeable("NewImplDocumentStore", "TEST2", owner));
+
+    vm.expectRevert(
+      abi.encodeWithSelector(
+        IAccessControl.AccessControlUnauthorizedAccount.selector,
+        nonAdmin,
+        documentStore.DEFAULT_ADMIN_ROLE()
+      )
+    );
+
+    vm.prank(nonAdmin);
+    dsProxy.upgradeToAndCall(newImplementation, "");
+  }
+
+  function testUpgradeToAndCallAsAdmin() public {
+    address newImplementation = address(new OwnableDocumentStoreUpgradeable("TestName", implSymbol, owner));
+
+    vm.prank(owner);
+    dsProxy.upgradeToAndCall(newImplementation, "");
+
+    bytes32 proxyImpl = vm.load(address(dsProxy), 0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc);
+
+    assertEq(newImplementation, address(uint160(uint256(proxyImpl))));
+  }
+
+  function testUpgradeToAndCallReinitialiseFail() public {
+    address newImplementation = address(new OwnableDocumentStoreUpgradeable("TestName", implSymbol, owner));
+    bytes memory initData = abi.encodeCall(
+      OwnableDocumentStoreUpgradeable.initialize,
+      (initialName, initialSymbol, owner)
+    );
+
+    vm.expectRevert(abi.encodeWithSelector(Initializable.InvalidInitialization.selector));
+
+    vm.prank(owner);
+    dsProxy.upgradeToAndCall(newImplementation, initData);
+  }
+}