diff --git a/src/ApiGenerator/Domain/Specification/UrlPart.cs b/src/ApiGenerator/Domain/Specification/UrlPart.cs
index 0e9587400f7..bdf370310ac 100644
--- a/src/ApiGenerator/Domain/Specification/UrlPart.cs
+++ b/src/ApiGenerator/Domain/Specification/UrlPart.cs
@@ -95,6 +95,7 @@ public string HighLevelTypeName
 					case "application":
 					case "repository":
 					case "snapshot":
+					case "target_snapshot":
 					case "user":
 					case "username":
 					case "realms":
diff --git a/src/Elasticsearch.Net/Api/RequestParameters/RequestParameters.Snapshot.cs b/src/Elasticsearch.Net/Api/RequestParameters/RequestParameters.Snapshot.cs
index 467651188b5..6e25cdcf8f2 100644
--- a/src/Elasticsearch.Net/Api/RequestParameters/RequestParameters.Snapshot.cs
+++ b/src/Elasticsearch.Net/Api/RequestParameters/RequestParameters.Snapshot.cs
@@ -44,7 +44,7 @@ public TimeSpan Timeout
 	}
 
 	///<summary>Request options for Clone <para>https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html</para></summary>
-	public class CloneRequestParameters : RequestParameters<CloneRequestParameters>
+	public class CloneSnapshotRequestParameters : RequestParameters<CloneSnapshotRequestParameters>
 	{
 		///<summary>Explicit operation timeout for connection to master node</summary>
 		public TimeSpan MasterTimeout
diff --git a/src/Elasticsearch.Net/ElasticLowLevelClient.Snapshot.cs b/src/Elasticsearch.Net/ElasticLowLevelClient.Snapshot.cs
index 8355c976db5..bbbecb0e38e 100644
--- a/src/Elasticsearch.Net/ElasticLowLevelClient.Snapshot.cs
+++ b/src/Elasticsearch.Net/ElasticLowLevelClient.Snapshot.cs
@@ -61,7 +61,7 @@ public Task<TResponse> CleanupRepositoryAsync<TResponse>(string repository, Clea
 		///<param name = "targetSnapshot">The name of the cloned snapshot to create</param>
 		///<param name = "body">The snapshot clone definition</param>
 		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
-		public TResponse Clone<TResponse>(string repository, string snapshot, string targetSnapshot, PostData body, CloneRequestParameters requestParameters = null)
+		public TResponse Clone<TResponse>(string repository, string snapshot, string targetSnapshot, PostData body, CloneSnapshotRequestParameters requestParameters = null)
 			where TResponse : class, ITransportResponse, new() => DoRequest<TResponse>(PUT, Url($"_snapshot/{repository:repository}/{snapshot:snapshot}/_clone/{targetSnapshot:targetSnapshot}"), body, RequestParams(requestParameters));
 		///<summary>PUT on /_snapshot/{repository}/{snapshot}/_clone/{target_snapshot} <para>https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html</para></summary>
 		///<param name = "repository">A repository name</param>
@@ -70,7 +70,7 @@ public TResponse Clone<TResponse>(string repository, string snapshot, string tar
 		///<param name = "body">The snapshot clone definition</param>
 		///<param name = "requestParameters">Request specific configuration such as querystring parameters &amp; request specific connection settings.</param>
 		[MapsApi("snapshot.clone", "repository, snapshot, target_snapshot, body")]
-		public Task<TResponse> CloneAsync<TResponse>(string repository, string snapshot, string targetSnapshot, PostData body, CloneRequestParameters requestParameters = null, CancellationToken ctx = default)
+		public Task<TResponse> CloneAsync<TResponse>(string repository, string snapshot, string targetSnapshot, PostData body, CloneSnapshotRequestParameters requestParameters = null, CancellationToken ctx = default)
 			where TResponse : class, ITransportResponse, new() => DoRequestAsync<TResponse>(PUT, Url($"_snapshot/{repository:repository}/{snapshot:snapshot}/_clone/{targetSnapshot:targetSnapshot}"), ctx, body, RequestParams(requestParameters));
 		///<summary>PUT on /_snapshot/{repository}/{snapshot} <para>https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html</para></summary>
 		///<param name = "repository">A repository name</param>
diff --git a/src/Nest/Descriptors.Snapshot.cs b/src/Nest/Descriptors.Snapshot.cs
index a4b0537d3a8..70ef5b78f9d 100644
--- a/src/Nest/Descriptors.Snapshot.cs
+++ b/src/Nest/Descriptors.Snapshot.cs
@@ -58,6 +58,35 @@ protected CleanupRepositoryDescriptor(): base()
 		public CleanupRepositoryDescriptor Timeout(Time timeout) => Qs("timeout", timeout);
 	}
 
+	///<summary>Descriptor for Clone <para>https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html</para></summary>
+	public partial class CloneSnapshotDescriptor : RequestDescriptorBase<CloneSnapshotDescriptor, CloneSnapshotRequestParameters, ICloneSnapshotRequest>, ICloneSnapshotRequest
+	{
+		internal override ApiUrls ApiUrls => ApiUrlsLookups.SnapshotClone;
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+		protected override bool SupportsBody => true;
+		///<summary>/_snapshot/{repository}/{snapshot}/_clone/{target_snapshot}</summary>
+		///<param name = "repository">this parameter is required</param>
+		///<param name = "snapshot">this parameter is required</param>
+		///<param name = "targetSnapshot">this parameter is required</param>
+		public CloneSnapshotDescriptor(Name repository, Name snapshot, Name targetSnapshot): base(r => r.Required("repository", repository).Required("snapshot", snapshot).Required("target_snapshot", targetSnapshot))
+		{
+		}
+
+		///<summary>Used for serialization purposes, making sure we have a parameterless constructor</summary>
+		[SerializationConstructor]
+		protected CloneSnapshotDescriptor(): base()
+		{
+		}
+
+		// values part of the url path
+		Name ICloneSnapshotRequest.RepositoryName => Self.RouteValues.Get<Name>("repository");
+		Name ICloneSnapshotRequest.Snapshot => Self.RouteValues.Get<Name>("snapshot");
+		Name ICloneSnapshotRequest.TargetSnapshot => Self.RouteValues.Get<Name>("target_snapshot");
+		// Request parameters
+		///<summary>Explicit operation timeout for connection to master node</summary>
+		public CloneSnapshotDescriptor MasterTimeout(Time mastertimeout) => Qs("master_timeout", mastertimeout);
+	}
+
 	///<summary>Descriptor for Snapshot <para>https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html</para></summary>
 	public partial class SnapshotDescriptor : RequestDescriptorBase<SnapshotDescriptor, SnapshotRequestParameters, ISnapshotRequest>, ISnapshotRequest
 	{
@@ -322,4 +351,4 @@ protected VerifyRepositoryDescriptor(): base()
 		///<summary>Explicit operation timeout</summary>
 		public VerifyRepositoryDescriptor Timeout(Time timeout) => Qs("timeout", timeout);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/ElasticClient.Snapshot.cs b/src/Nest/ElasticClient.Snapshot.cs
index 0d88e4036fd..0cffd617513 100644
--- a/src/Nest/ElasticClient.Snapshot.cs
+++ b/src/Nest/ElasticClient.Snapshot.cs
@@ -61,6 +61,30 @@ internal SnapshotNamespace(ElasticClient client): base(client)
 		/// </summary>
 		public Task<CleanupRepositoryResponse> CleanupRepositoryAsync(ICleanupRepositoryRequest request, CancellationToken ct = default) => DoRequestAsync<ICleanupRepositoryRequest, CleanupRepositoryResponse>(request, request.RequestParameters, ct);
 		/// <summary>
+		/// <c>PUT</c> request to the <c>snapshot.clone</c> API, read more about this API online:
+		/// <para></para>
+		/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html</a>
+		/// </summary>
+		public CloneSnapshotResponse Clone(Name repository, Name snapshot, Name targetSnapshot, Func<CloneSnapshotDescriptor, ICloneSnapshotRequest> selector) => Clone(selector.InvokeOrDefault(new CloneSnapshotDescriptor(repository: repository, snapshot: snapshot, targetSnapshot: targetSnapshot)));
+		/// <summary>
+		/// <c>PUT</c> request to the <c>snapshot.clone</c> API, read more about this API online:
+		/// <para></para>
+		/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html</a>
+		/// </summary>
+		public Task<CloneSnapshotResponse> CloneAsync(Name repository, Name snapshot, Name targetSnapshot, Func<CloneSnapshotDescriptor, ICloneSnapshotRequest> selector, CancellationToken ct = default) => CloneAsync(selector.InvokeOrDefault(new CloneSnapshotDescriptor(repository: repository, snapshot: snapshot, targetSnapshot: targetSnapshot)), ct);
+		/// <summary>
+		/// <c>PUT</c> request to the <c>snapshot.clone</c> API, read more about this API online:
+		/// <para></para>
+		/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html</a>
+		/// </summary>
+		public CloneSnapshotResponse Clone(ICloneSnapshotRequest request) => DoRequest<ICloneSnapshotRequest, CloneSnapshotResponse>(request, request.RequestParameters);
+		/// <summary>
+		/// <c>PUT</c> request to the <c>snapshot.clone</c> API, read more about this API online:
+		/// <para></para>
+		/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html</a>
+		/// </summary>
+		public Task<CloneSnapshotResponse> CloneAsync(ICloneSnapshotRequest request, CancellationToken ct = default) => DoRequestAsync<ICloneSnapshotRequest, CloneSnapshotResponse>(request, request.RequestParameters, ct);
+		/// <summary>
 		/// <c>PUT</c> request to the <c>snapshot.create</c> API, read more about this API online:
 		/// <para></para>
 		/// <a href = "https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html">https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html</a>
diff --git a/src/Nest/Modules/SnapshotAndRestore/Snapshot/Clone/CloneSnapshotRequest.cs b/src/Nest/Modules/SnapshotAndRestore/Snapshot/Clone/CloneSnapshotRequest.cs
new file mode 100644
index 00000000000..c7cd0773f2c
--- /dev/null
+++ b/src/Nest/Modules/SnapshotAndRestore/Snapshot/Clone/CloneSnapshotRequest.cs
@@ -0,0 +1,39 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using System.Runtime.Serialization;
+
+namespace Nest
+{
+	[MapsApi("snapshot.clone.json")]
+	[ReadAs(typeof(CloneSnapshotRequest))]
+	public partial interface ICloneSnapshotRequest
+	{
+		/// <summary>
+		/// The indices to clone.
+		/// </summary>
+		[DataMember(Name = "indices")]
+		Indices Indices { get; set; }
+	}
+
+	public partial class CloneSnapshotRequest
+	{
+		/// <inheritdoc />
+		public Indices Indices { get; set; }
+	}
+
+	public partial class CloneSnapshotDescriptor
+	{
+		Indices ICloneSnapshotRequest.Indices { get; set; }
+
+		/// <inheritdoc cref="IRestoreRequest.Indices" />
+		public CloneSnapshotDescriptor Index(IndexName index) => Indices(index);
+
+		/// <inheritdoc cref="IRestoreRequest.Indices" />
+		public CloneSnapshotDescriptor Index<T>() where T : class => Indices(typeof(T));
+
+		/// <inheritdoc cref="IRestoreRequest.Indices" />
+		public CloneSnapshotDescriptor Indices(Indices indices) => Assign(indices, (a, v) => a.Indices = v);
+	}
+}
diff --git a/src/Nest/Modules/SnapshotAndRestore/Snapshot/Clone/CloneSnapshotResponse.cs b/src/Nest/Modules/SnapshotAndRestore/Snapshot/Clone/CloneSnapshotResponse.cs
new file mode 100644
index 00000000000..2a8ea165c1d
--- /dev/null
+++ b/src/Nest/Modules/SnapshotAndRestore/Snapshot/Clone/CloneSnapshotResponse.cs
@@ -0,0 +1,8 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+namespace Nest
+{
+	public class CloneSnapshotResponse : AcknowledgedResponseBase { }
+}
diff --git a/src/Nest/Requests.Snapshot.cs b/src/Nest/Requests.Snapshot.cs
index b6c9e83d160..4a6540bb418 100644
--- a/src/Nest/Requests.Snapshot.cs
+++ b/src/Nest/Requests.Snapshot.cs
@@ -80,6 +80,65 @@ public Time Timeout
 		}
 	}
 
+	[InterfaceDataContract]
+	public partial interface ICloneSnapshotRequest : IRequest<CloneSnapshotRequestParameters>
+	{
+		[IgnoreDataMember]
+		Name RepositoryName
+		{
+			get;
+		}
+
+		[IgnoreDataMember]
+		Name Snapshot
+		{
+			get;
+		}
+
+		[IgnoreDataMember]
+		Name TargetSnapshot
+		{
+			get;
+		}
+	}
+
+	///<summary>Request for Clone <para>https://www.elastic.co/guide/en/elasticsearch/reference/master/modules-snapshots.html</para></summary>
+	public partial class CloneSnapshotRequest : PlainRequestBase<CloneSnapshotRequestParameters>, ICloneSnapshotRequest
+	{
+		protected ICloneSnapshotRequest Self => this;
+		internal override ApiUrls ApiUrls => ApiUrlsLookups.SnapshotClone;
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+		protected override bool SupportsBody => true;
+		///<summary>/_snapshot/{repository}/{snapshot}/_clone/{target_snapshot}</summary>
+		///<param name = "repository">this parameter is required</param>
+		///<param name = "snapshot">this parameter is required</param>
+		///<param name = "targetSnapshot">this parameter is required</param>
+		public CloneSnapshotRequest(Name repository, Name snapshot, Name targetSnapshot): base(r => r.Required("repository", repository).Required("snapshot", snapshot).Required("target_snapshot", targetSnapshot))
+		{
+		}
+
+		///<summary>Used for serialization purposes, making sure we have a parameterless constructor</summary>
+		[SerializationConstructor]
+		protected CloneSnapshotRequest(): base()
+		{
+		}
+
+		// values part of the url path
+		[IgnoreDataMember]
+		Name ICloneSnapshotRequest.RepositoryName => Self.RouteValues.Get<Name>("repository");
+		[IgnoreDataMember]
+		Name ICloneSnapshotRequest.Snapshot => Self.RouteValues.Get<Name>("snapshot");
+		[IgnoreDataMember]
+		Name ICloneSnapshotRequest.TargetSnapshot => Self.RouteValues.Get<Name>("target_snapshot");
+		// Request parameters
+		///<summary>Explicit operation timeout for connection to master node</summary>
+		public Time MasterTimeout
+		{
+			get => Q<Time>("master_timeout");
+			set => Q("master_timeout", value);
+		}
+	}
+
 	[InterfaceDataContract]
 	public partial interface ISnapshotRequest : IRequest<SnapshotRequestParameters>
 	{
@@ -567,4 +626,4 @@ public Time Timeout
 			set => Q("timeout", value);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Nest/_Generated/ApiUrlsLookup.generated.cs b/src/Nest/_Generated/ApiUrlsLookup.generated.cs
index 8dcea1379b9..45f3b4d1eca 100644
--- a/src/Nest/_Generated/ApiUrlsLookup.generated.cs
+++ b/src/Nest/_Generated/ApiUrlsLookup.generated.cs
@@ -276,6 +276,7 @@ internal static class ApiUrlsLookups
 		internal static ApiUrls SnapshotLifecycleManagementStart = new ApiUrls(new[]{"_slm/start"});
 		internal static ApiUrls SnapshotLifecycleManagementStop = new ApiUrls(new[]{"_slm/stop"});
 		internal static ApiUrls SnapshotCleanupRepository = new ApiUrls(new[]{"_snapshot/{repository}/_cleanup"});
+		internal static ApiUrls SnapshotClone = new ApiUrls(new[]{"_snapshot/{repository}/{snapshot}/_clone/{target_snapshot}"});
 		internal static ApiUrls SnapshotSnapshot = new ApiUrls(new[]{"_snapshot/{repository}/{snapshot}"});
 		internal static ApiUrls SnapshotCreateRepository = new ApiUrls(new[]{"_snapshot/{repository}"});
 		internal static ApiUrls SnapshotDelete = new ApiUrls(new[]{"_snapshot/{repository}/{snapshot}"});
diff --git a/tests/Tests/Modules/SnapshotAndRestore/Snapshot/CloneSnapshot/CloneSnapshotApiTests.cs b/tests/Tests/Modules/SnapshotAndRestore/Snapshot/CloneSnapshot/CloneSnapshotApiTests.cs
new file mode 100644
index 00000000000..801f588bc89
--- /dev/null
+++ b/tests/Tests/Modules/SnapshotAndRestore/Snapshot/CloneSnapshot/CloneSnapshotApiTests.cs
@@ -0,0 +1,48 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using System;
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
+using Elastic.Transport;
+using Nest;
+using Tests.Core.ManagedElasticsearch.Clusters;
+using Tests.Framework.EndpointTests;
+using Tests.Framework.EndpointTests.TestState;
+
+namespace Tests.Modules.SnapshotAndRestore.Snapshot.CloneSnapshot
+{
+	[SkipVersion("<7.10.0", "APIs introduced in 7.10.0")]
+	public class CloneSnapshotApiTests
+		: ApiTestBase<WritableCluster, CloneSnapshotResponse, ICloneSnapshotRequest, CloneSnapshotDescriptor, CloneSnapshotRequest>
+	{
+		private const string Repository = "repository1";
+		private const string SnapshotName = "snapshot1";
+		private const string Target = "snapshot1-clone";
+
+		public CloneSnapshotApiTests(WritableCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override Func<CloneSnapshotDescriptor, ICloneSnapshotRequest> Fluent => d => d.Indices("*");
+		protected override HttpMethod HttpMethod => HttpMethod.PUT;
+		protected override CloneSnapshotRequest Initializer => new CloneSnapshotRequest(Repository, SnapshotName, Target) { Indices = "*" };
+
+		protected override object ExpectJson =>
+			new
+			{
+				indices = "*"
+			};
+
+		protected override bool SupportsDeserialization => false;
+
+		protected override string UrlPath => $"/_snapshot/{Repository}/{SnapshotName}/_clone/{Target}";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			(client, f) => client.Snapshot.Clone(Repository, SnapshotName, Target, f),
+			(client, f) => client.Snapshot.CloneAsync(Repository, SnapshotName, Target, f),
+			(client, r) => client.Snapshot.Clone(r),
+			(client, r) => client.Snapshot.CloneAsync(r)
+		);
+
+		protected override CloneSnapshotDescriptor NewDescriptor() => new(Repository, SnapshotName, Target);
+	}
+}
diff --git a/tests/Tests/Modules/SnapshotAndRestore/Snapshot/CloneSnapshot/CloneSnapshotUrlTests.cs b/tests/Tests/Modules/SnapshotAndRestore/Snapshot/CloneSnapshot/CloneSnapshotUrlTests.cs
new file mode 100644
index 00000000000..4c1942a97b7
--- /dev/null
+++ b/tests/Tests/Modules/SnapshotAndRestore/Snapshot/CloneSnapshot/CloneSnapshotUrlTests.cs
@@ -0,0 +1,29 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using System.Threading.Tasks;
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
+using Nest;
+using Tests.Framework.EndpointTests;
+using static Tests.Framework.EndpointTests.UrlTester;
+
+namespace Tests.Modules.SnapshotAndRestore.Snapshot.CloneSnapshot
+{
+	public class CloneSnapshotUrlTests
+	{
+		[U] public async Task Urls()
+		{
+			const string repository = "repository";
+			const string snapshot = "snapshot";
+			const string target = "snapshot-clone";
+
+			await PUT($"/_snapshot/{repository}/{snapshot}/_clone/{target}")
+					.Fluent(c => c.Snapshot.Clone(repository, snapshot, target, f => f))
+					.Request(c => c.Snapshot.Clone(new CloneSnapshotRequest(repository, snapshot, target)))
+					.FluentAsync(c => c.Snapshot.CloneAsync(repository, snapshot, target, f => f))
+					.RequestAsync(c => c.Snapshot.CloneAsync(new CloneSnapshotRequest(repository, snapshot, target)))
+				;
+		}
+	}
+}
diff --git a/tests/Tests/Modules/SnapshotAndRestore/Snapshot/CoordinatedSnapshotTests.cs b/tests/Tests/Modules/SnapshotAndRestore/Snapshot/CoordinatedSnapshotTests.cs
new file mode 100644
index 00000000000..3a6f58f22a7
--- /dev/null
+++ b/tests/Tests/Modules/SnapshotAndRestore/Snapshot/CoordinatedSnapshotTests.cs
@@ -0,0 +1,130 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
+using Elasticsearch.Net;
+using FluentAssertions;
+using Nest;
+using Tests.Core.Extensions;
+using Tests.Core.ManagedElasticsearch.Clusters;
+using Tests.Framework.EndpointTests;
+using Tests.Framework.EndpointTests.TestState;
+
+namespace Tests.Modules.SnapshotAndRestore.Snapshot
+{
+	public class CoordinatedSnapshotTests : CoordinatedIntegrationTestBase<IntrusiveOperationCluster>
+	{
+		private const string SetupStep = nameof(SetupStep);
+		private const string CreateSnapshotStep = nameof(CreateSnapshotStep);
+		private const string GetSnapshotStep = nameof(GetSnapshotStep);
+		private const string CloneStep = nameof(CloneStep);
+		private const string DeleteSnapshotStep = nameof(DeleteSnapshotStep);
+		private const string DeleteNonExistentSnapshotStep = nameof(DeleteNonExistentSnapshotStep);
+
+		public CoordinatedSnapshotTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(new CoordinatedUsage(cluster, usage)
+		{
+			{
+				SetupStep, u => u
+					.Call(async (v, c) =>
+					{
+						await c.Snapshot.CreateRepositoryAsync($"{v}-repository", cr => cr.FileSystem(fs => fs.Settings(Path.Combine(cluster.FileSystem.RepositoryPath, v))));
+						await c.Indices.CreateAsync($"{v}-index");
+						await c.Cluster.HealthAsync($"{v}-index", ch => ch.WaitForStatus(WaitForStatus.Yellow));
+					})
+			},
+			{
+				CreateSnapshotStep, u => u
+					.Calls<SnapshotDescriptor, SnapshotRequest, ISnapshotRequest, SnapshotResponse>(
+						v => new SnapshotRequest($"{v}-repository", $"{v}-source") { Indices = $"{v}-index", WaitForCompletion = true },
+						(v, d) => d.Index($"{v}-index").WaitForCompletion(true),
+						(v, c, f) => c.Snapshot.Snapshot($"{v}-repository", $"{v}-source", f),
+						(v, c, f) => c.Snapshot.SnapshotAsync($"{v}-repository", $"{v}-source", f),
+						(_, c, r) => c.Snapshot.Snapshot(r),
+						(_, c, r) => c.Snapshot.SnapshotAsync(r))
+			},
+			{
+				GetSnapshotStep, u => u
+					.Calls<GetSnapshotDescriptor, GetSnapshotRequest, IGetSnapshotRequest, GetSnapshotResponse>(
+						v => new GetSnapshotRequest($"{v}-repository", $"{v}-source"),
+						(v, d) => d,
+						(v, c, f) => c.Snapshot.Get($"{v}-repository", $"{v}-source", f),
+						(v, c, f) => c.Snapshot.GetAsync($"{v}-repository", $"{v}-source", f),
+						(_, c, r) => c.Snapshot.Get(r),
+						(_, c, r) => c.Snapshot.GetAsync(r))
+			},
+			{
+				CloneStep, ">=7.10.0", u => u
+					.Calls<CloneSnapshotDescriptor, CloneSnapshotRequest, ICloneSnapshotRequest, CloneSnapshotResponse>(
+						v => new CloneSnapshotRequest($"{v}-repository", $"{v}-source", $"{v}-target"){ Indices = $"{v}-index" },
+						(v, d) => d.Index($"{v}-index"),
+						(v, c, f) => c.Snapshot.Clone($"{v}-repository", $"{v}-source", $"{v}-target", f),
+						(v, c, f) => c.Snapshot.CloneAsync($"{v}-repository", $"{v}-source", $"{v}-target", f),
+						(_, c, r) => c.Snapshot.Clone(r),
+						(_, c, r) => c.Snapshot.CloneAsync(r))
+			},
+			{
+				DeleteSnapshotStep, u => u
+					.Calls<DeleteSnapshotDescriptor, DeleteSnapshotRequest, IDeleteSnapshotRequest, DeleteSnapshotResponse>(
+						v => new DeleteSnapshotRequest($"{v}-repository", $"{v}-source"),
+						(v, d) => d,
+						(v, c, f) => c.Snapshot.Delete($"{v}-repository", $"{v}-source", f),
+						(v, c, f) => c.Snapshot.DeleteAsync($"{v}-repository", $"{v}-source", f),
+						(_, c, r) => c.Snapshot.Delete(r),
+						(_, c, r) => c.Snapshot.DeleteAsync(r))
+			},
+			{
+				DeleteNonExistentSnapshotStep, u => u
+					.Calls<DeleteSnapshotDescriptor, DeleteSnapshotRequest, IDeleteSnapshotRequest, DeleteSnapshotResponse>(
+						v => new DeleteSnapshotRequest($"{v}-repository", v),
+						(v, d) => d,
+						(v, c, f) => c.Snapshot.Delete($"{v}-repository", v, f),
+						(v, c, f) => c.Snapshot.DeleteAsync($"{v}-repository", v, f),
+						(_, c, r) => c.Snapshot.Delete(r),
+						(_, c, r) => c.Snapshot.DeleteAsync(r))
+			}
+		})
+		{ }
+
+		[I]
+		public async Task CreateSnapshotResponse() => await Assert<SnapshotResponse>(CreateSnapshotStep, r =>
+		{
+			r.Accepted.Should().BeTrue();
+			r.Snapshot.Indices.Count.Should().Be(1);
+			r.Snapshot.StartTime.Should().BeOnOrBefore(DateTime.Now);
+		});
+
+		[I]
+		public async Task GetSnapshotResponse() => await Assert<GetSnapshotResponse>(GetSnapshotStep, r =>
+		{
+			r.Snapshots.Should().HaveCount(1);
+			var snapshot = r.Snapshots.FirstOrDefault();
+			snapshot.Should().NotBeNull();
+		});
+
+		[I]
+		public async Task CloneSnapshotResponse() => await Assert<CloneSnapshotResponse>(CloneStep, r =>
+		{
+			r.Acknowledged.Should().BeTrue();
+		});
+
+		[I]
+		public async Task DeleteSnapshotResponse() => await Assert<DeleteSnapshotResponse>(DeleteSnapshotStep, r =>
+		{
+			r.Acknowledged.Should().BeTrue();
+		});
+
+		[I]
+		public async Task DeleteNonExistentSnapshotResponse() => await Assert<DeleteSnapshotResponse>(DeleteNonExistentSnapshotStep, r =>
+		{
+			r.ShouldNotBeValid();
+			r.ServerError.Should().NotBeNull();
+			r.ServerError.Status.Should().Be(404);
+			r.ServerError.Error.Reason.Should().Contain("missing");
+		});
+	}
+}
diff --git a/tests/Tests/Modules/SnapshotAndRestore/Snapshot/SnapshotCrudTests.cs b/tests/Tests/Modules/SnapshotAndRestore/Snapshot/SnapshotCrudTests.cs
deleted file mode 100644
index 08f838c5a8d..00000000000
--- a/tests/Tests/Modules/SnapshotAndRestore/Snapshot/SnapshotCrudTests.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-// Licensed to Elasticsearch B.V under one or more agreements.
-// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-// See the LICENSE file in the project root for more information
-
-using System;
-using System.IO;
-using System.Linq;
-using Elastic.Elasticsearch.Xunit.XunitPlumbing;
-using Elasticsearch.Net;
-using FluentAssertions;
-using Nest;
-using Tests.Core.ManagedElasticsearch.Clusters;
-using Tests.Framework.EndpointTests;
-using Tests.Framework.EndpointTests.TestState;
-
-namespace Tests.Modules.SnapshotAndRestore.Snapshot
-{
-	[SkipVersion(">=8.0.0-SNAPSHOT", "TODO investigate")]
-	public class SnapshotCrudTests
-		: CrudTestBase<IntrusiveOperationCluster, SnapshotResponse, GetSnapshotResponse, AcknowledgedResponseBase, DeleteSnapshotResponse>
-	{
-		private static readonly string SnapshotIndexName = Guid.NewGuid().ToString("N").Substring(8);
-
-		private readonly string _repositoryLocation;
-		private readonly string _repositoryName = RandomString();
-
-		public SnapshotCrudTests(IntrusiveOperationCluster cluster, EndpointUsage usage) : base(cluster, usage) =>
-			_repositoryLocation = Path.Combine(cluster.FileSystem.RepositoryPath, RandomString());
-
-		protected override void IntegrationSetup(IElasticClient client)
-		{
-			var create = Client.Snapshot.CreateRepository(_repositoryName, cr => cr
-				.FileSystem(fs => fs
-					.Settings(_repositoryLocation)
-				)
-			);
-
-			if (!create.IsValid || !create.Acknowledged)
-				throw new Exception("Setup: failed to create snapshot repository");
-
-			var createIndex = Client.Indices.Create(SnapshotIndexName);
-			var waitForIndex = Client.Cluster.Health(SnapshotIndexName, c => c
-				.WaitForStatus(WaitForStatus.Yellow)
-			);
-		}
-
-		protected override LazyResponses Create() => Calls<SnapshotDescriptor, SnapshotRequest, ISnapshotRequest, SnapshotResponse>(
-			CreateInitializer,
-			CreateFluent,
-			(s, c, f) => c.Snapshot.Snapshot(_repositoryName, s, f),
-			(s, c, f) => c.Snapshot.SnapshotAsync(_repositoryName, s, f),
-			(s, c, r) => c.Snapshot.Snapshot(r),
-			(s, c, r) => c.Snapshot.SnapshotAsync(r)
-		);
-
-		protected SnapshotRequest CreateInitializer(string snapshotName) => new SnapshotRequest(_repositoryName, snapshotName)
-		{
-			WaitForCompletion = true,
-			Indices = SnapshotIndexName
-		};
-
-		protected ISnapshotRequest CreateFluent(string snapshotName, SnapshotDescriptor d) => d
-			.WaitForCompletion()
-			.Indices(SnapshotIndexName);
-
-		protected override LazyResponses Read() => Calls<GetSnapshotDescriptor, GetSnapshotRequest, IGetSnapshotRequest, GetSnapshotResponse>(
-			ReadInitializer,
-			ReadFluent,
-			(s, c, f) => c.Snapshot.Get(_repositoryName, s, f),
-			(s, c, f) => c.Snapshot.GetAsync(_repositoryName, s, f),
-			(s, c, r) => c.Snapshot.Get(r),
-			(s, c, r) => c.Snapshot.GetAsync(r)
-		);
-
-		protected GetSnapshotRequest ReadInitializer(string snapshotName) => new GetSnapshotRequest(_repositoryName, snapshotName);
-
-		protected IGetSnapshotRequest ReadFluent(string snapshotName, GetSnapshotDescriptor d) => null;
-
-		protected override LazyResponses Delete() =>
-			Calls<DeleteSnapshotDescriptor, DeleteSnapshotRequest, IDeleteSnapshotRequest, DeleteSnapshotResponse>(
-				DeleteInitializer,
-				DeleteFluent,
-				(s, c, f) => c.Snapshot.Delete(_repositoryName, s, f),
-				(s, c, f) => c.Snapshot.DeleteAsync(_repositoryName, s, f),
-				(s, c, r) => c.Snapshot.Delete(r),
-				(s, c, r) => c.Snapshot.DeleteAsync(r)
-			);
-
-		protected DeleteSnapshotRequest DeleteInitializer(string snapshotName) => new DeleteSnapshotRequest(_repositoryName, snapshotName);
-
-		protected IDeleteSnapshotRequest DeleteFluent(string snapshotName, DeleteSnapshotDescriptor d) => null;
-
-		protected override LazyResponses Update() => LazyResponses.Empty;
-
-		protected override void ExpectAfterCreate(GetSnapshotResponse response)
-		{
-			response.Snapshots.Should().HaveCount(1);
-			var snapshot = response.Snapshots.FirstOrDefault();
-			snapshot.Should().NotBeNull();
-		}
-
-		protected override void ExpectDeleteNotFoundResponse(DeleteSnapshotResponse response)
-		{
-			response.ServerError.Should().NotBeNull();
-			response.ServerError.Status.Should().Be(404);
-			response.ServerError.Error.Reason.Should().Contain("missing");
-		}
-	}
-}