diff --git a/indy_node/test/helper.py b/indy_node/test/helper.py
index 30005c2c0..466694332 100644
--- a/indy_node/test/helper.py
+++ b/indy_node/test/helper.py
@@ -1,5 +1,10 @@
+import asyncio
 import json
+from collections import Callable
+from functools import partial
+
 import base58
+import time
 
 from indy.did import replace_keys_start, replace_keys_apply
 from indy.ledger import build_attrib_request, build_get_attrib_request
@@ -21,10 +26,25 @@
 
 logger = getlogger()
 
+TEST_INITIAL_NODE_VERSION = '1.0.0'
+
 
 @spyable(methods=[Upgrader.processLedger])
 class TestUpgrader(Upgrader):
-    pass
+
+    def __init__(self, nodeId, nodeName, dataDir, config, ledger=None, actionLog=None,
+                 actionFailedCallback: Callable = None, action_start_callback: Callable = None):
+        self.version = TEST_INITIAL_NODE_VERSION
+        super().__init__(nodeId, nodeName, dataDir, config, ledger, actionLog, actionFailedCallback,
+                         action_start_callback)
+
+    async def _sendUpgradeRequest(self, when, version, upgrade_id, failTimeout, pkg_name):
+        retryLimit = self.retry_limit
+        if retryLimit:
+            self.version = version
+        while retryLimit:
+            break
+        self._unscheduleAction()
 
 
 # noinspection PyShadowingNames,PyShadowingNames
diff --git a/indy_node/test/upgrade/test_broken_connection_control_tool.py b/indy_node/test/upgrade/test_broken_connection_control_tool.py
new file mode 100644
index 000000000..8884ca45e
--- /dev/null
+++ b/indy_node/test/upgrade/test_broken_connection_control_tool.py
@@ -0,0 +1,111 @@
+import dateutil
+import dateutil.tz
+import pytest
+
+from datetime import datetime, timedelta
+
+from indy_common.constants import START
+
+from indy_node.test.upgrade.conftest import patch_packet_mgr_output, EXT_PKT_NAME, EXT_PKT_VERSION
+
+from indy_common.config_helper import NodeConfigHelper
+
+from indy_node.server.upgrader import Upgrader
+from indy_node.test.helper import TEST_INITIAL_NODE_VERSION
+from indy_node.test.upgrade.helper import sdk_ensure_upgrade_sent, bumpedVersion
+from plenum.test.helper import randomText
+
+from plenum.test.test_node import ensureElectionsDone, checkNodesConnected
+
+delta = 2
+
+
+@pytest.fixture(scope="module")
+def tconf(tconf):
+    old_delta = tconf.MinSepBetweenNodeUpgrades
+    tconf.MinSepBetweenNodeUpgrades = delta
+    yield tconf
+    tconf.MinSepBetweenNodeUpgrades = old_delta
+
+
+@pytest.fixture(scope='function')
+def validUpgrade(nodeIds, tconf, monkeypatch):
+    schedule = {}
+    unow = datetime.utcnow().replace(tzinfo=dateutil.tz.tzutc())
+    startAt = unow + timedelta(seconds=100)
+    acceptableDiff = tconf.MinSepBetweenNodeUpgrades + 1
+    for i in nodeIds:
+        schedule[i] = datetime.isoformat(startAt)
+        startAt = startAt + timedelta(seconds=acceptableDiff + 3)
+
+    patch_packet_mgr_output(monkeypatch, EXT_PKT_NAME, EXT_PKT_VERSION)
+
+    return dict(name='upgrade-{}'.format(randomText(3)), version=bumpedVersion(EXT_PKT_VERSION),
+                action=START, schedule=schedule, timeout=1, package=EXT_PKT_NAME,
+                sha256='db34a72a90d026dae49c3b3f0436c8d3963476c77468ad955845a1ccf7b03f55')
+
+
+def test_node_doesnt_retry_upgrade(
+        looper, nodeSet, validUpgrade, nodeIds,
+        sdk_pool_handle, sdk_wallet_trustee, tconf):
+    bad_node = nodeSet[1]
+
+    # Making upgrade sooner
+    schedule = {}
+    unow = datetime.utcnow().replace(tzinfo=dateutil.tz.tzutc())
+    startAt = unow + timedelta(seconds=delta)
+    for i in nodeIds:
+        schedule[i] = datetime.isoformat(startAt)
+        startAt = startAt + timedelta(seconds=delta)
+    validUpgrade['schedule'] = schedule
+
+    # Emulating connection problems
+    bad_node.upgrader.retry_limit = 0
+
+    # Send upgrade
+    sdk_ensure_upgrade_sent(looper, sdk_pool_handle,
+                            sdk_wallet_trustee, validUpgrade)
+    looper.runFor(len(nodeIds) * delta)
+
+    # Every node except bad_node upgraded
+    for node in nodeSet:
+        if node is not bad_node:
+            assert node.upgrader.version == validUpgrade['version']
+    assert bad_node.upgrader.version == TEST_INITIAL_NODE_VERSION
+
+    # Every node, including bad_node, tried to upgrade only once
+    for node in nodeSet:
+        assert node.upgrader.spylog.count(Upgrader.processLedger.__name__) == 1
+
+
+def test_node_upgrades_after_restart(looper, nodeSet, testNodeClass, tconf,
+                                     tdir, allPluginsPath, validUpgrade):
+    bad_node = nodeSet[1]
+
+    # Do this to prevent exceptions because of node_control_tool absence
+    Upgrader.getVersion = lambda self, pkg: '1.6.0'
+    Upgrader._update_action_log_for_started_action = lambda self: 1
+
+    # Restart bad_node
+    name = bad_node.name
+    nodeSet.remove(bad_node)
+    bad_node.cleanupOnStopping = False
+    looper.removeProdable(bad_node)
+    bad_node.stop()
+    del bad_node
+    config_helper = NodeConfigHelper(name, tconf, chroot=tdir)
+    node = testNodeClass(name, config_helper=config_helper,
+                         config=tconf, pluginPaths=allPluginsPath)
+    looper.add(node)
+    nodeSet.append(node)
+    looper.run(checkNodesConnected(nodeSet))
+    ensureElectionsDone(looper=looper, nodes=nodeSet, retryWait=1)
+
+    bad_node = nodeSet[-1]
+
+    # Connection problems resolved
+    assert bad_node.upgrader.retry_limit == 3
+
+    # Node upgraded after restart
+    for node in nodeSet:
+        assert node.upgrader.version == validUpgrade['version']