diff --git a/cloud/disk_manager/internal/pkg/clients/nbs/testing_client.go b/cloud/disk_manager/internal/pkg/clients/nbs/testing_client.go
index e9a3cc2e9a..2346e7b934 100644
--- a/cloud/disk_manager/internal/pkg/clients/nbs/testing_client.go
+++ b/cloud/disk_manager/internal/pkg/clients/nbs/testing_client.go
@@ -596,7 +596,7 @@ func (c *testingClient) DisableDevices(
 		return fmt.Errorf("list of devices to disable should contain at least one device")
 	}
 
-	deviceUUIDsField, err := json.Marshal(deviceUUIDs)
+	j, err := json.Marshal(deviceUUIDs)
 	if err != nil {
 		return nil
 	}
@@ -604,7 +604,7 @@ func (c *testingClient) DisableDevices(
 	input := fmt.Sprintf(
 		"{\"DisableAgent\":{\"AgentId\":\"%v\",\"DeviceUUIDs\":%v},\"Message\":\"%v\"}",
 		agentID,
-		string(deviceUUIDsField),
+		string(j),
 		message,
 	)
 
diff --git a/cloud/disk_manager/internal/pkg/clients/nbs/tests/client_test.go b/cloud/disk_manager/internal/pkg/clients/nbs/tests/client_test.go
index 1ba477ba95..ddfedf2697 100644
--- a/cloud/disk_manager/internal/pkg/clients/nbs/tests/client_test.go
+++ b/cloud/disk_manager/internal/pkg/clients/nbs/tests/client_test.go
@@ -1779,16 +1779,16 @@ func TestEnsureCheckpointReady(t *testing.T) {
 
 	// Disabling device to enforce checkpoint status ERROR.
 	go func() {
-		// Waiting for the shadow disk to be created. At the same time, we do
-		// not wait for too long: device should be disabled before the
-		// checkpoint becomes ready.
-		time.Sleep(time.Second * 1)
+		var diskRegistryStateBackup nbs.DiskRegistryStateBackup
+		var shadowDisk *nbs.DiskRegistryBasedDisk
 
-		diskRegistryStateBackup, err := client.BackupDiskRegistryState(ctx)
-		require.NoError(t, err)
+		// Waiting for the shadow disk to be created.
+		for shadowDisk == nil {
+			diskRegistryStateBackup, err := client.BackupDiskRegistryState(ctx)
+			require.NoError(t, err)
+			shadowDisk = diskRegistryStateBackup.GetShadowDisk(diskID)
+		}
 
-		shadowDisk := diskRegistryStateBackup.GetShadowDisk(diskID)
-		require.NotNil(t, shadowDisk)
 		deviceUUIDs := shadowDisk.DeviceUUIDs
 		require.Equal(t, 1, len(deviceUUIDs))