diff --git a/source/Octopus.Manager.Tentacle/Octopus.Manager.Tentacle.csproj b/source/Octopus.Manager.Tentacle/Octopus.Manager.Tentacle.csproj
index 83989ef79..72a04012e 100644
--- a/source/Octopus.Manager.Tentacle/Octopus.Manager.Tentacle.csproj
+++ b/source/Octopus.Manager.Tentacle/Octopus.Manager.Tentacle.csproj
@@ -131,8 +131,8 @@
..\packages\Octopus.Manager.Core.3.13.9-tentsplit0048\lib\Octopus.Manager.Core.dll
-
- ..\packages\Octopus.Shared.3.13.9-tentsplit0048\lib\Octopus.Shared.dll
+
+ ..\packages\Octopus.Shared.3.14.1-enh-sha256-ui0002\lib\Octopus.Shared.dll
..\packages\Octopus.Time.1.0.8\lib\netstandard1.0\Octopus.Time.dll
diff --git a/source/Octopus.Manager.Tentacle/packages.config b/source/Octopus.Manager.Tentacle/packages.config
index de647108f..ba8f1a068 100644
--- a/source/Octopus.Manager.Tentacle/packages.config
+++ b/source/Octopus.Manager.Tentacle/packages.config
@@ -19,7 +19,7 @@
-
+
diff --git a/source/Octopus.Tentacle.Tests/Commands/RunAgentCommandFixture.cs b/source/Octopus.Tentacle.Tests/Commands/RunAgentCommandFixture.cs
index 9d3976bd9..68f586d1c 100644
--- a/source/Octopus.Tentacle.Tests/Commands/RunAgentCommandFixture.cs
+++ b/source/Octopus.Tentacle.Tests/Commands/RunAgentCommandFixture.cs
@@ -1,8 +1,9 @@
-using System.Security.Cryptography.X509Certificates;
using NSubstitute;
using NUnit.Framework;
using Octopus.Diagnostics;
using Octopus.Shared.Configuration;
+using Octopus.Shared.Security;
+using Octopus.Shared.Versioning;
using Octopus.Tentacle.Versioning;
using Octopus.Tentacle.Commands;
using Octopus.Tentacle.Communications;
@@ -27,7 +28,8 @@ public override void SetUp()
halibut = Substitute.For();
tentacleConfiguration = Substitute.For();
- tentacleConfiguration.TentacleCertificate.Returns(new X509Certificate2());
+ var certificate = new CertificateGenerator().GenerateNew("cn=Test.Cert.For.Octopus.Tests");
+ tentacleConfiguration.TentacleCertificate.Returns(certificate);
home = Substitute.For();
sleep = Substitute.For();
Command = new RunAgentCommand(
diff --git a/source/Octopus.Tentacle.Tests/Octopus.Tentacle.Tests.csproj b/source/Octopus.Tentacle.Tests/Octopus.Tentacle.Tests.csproj
index c77e51673..1b5d7667e 100644
--- a/source/Octopus.Tentacle.Tests/Octopus.Tentacle.Tests.csproj
+++ b/source/Octopus.Tentacle.Tests/Octopus.Tentacle.Tests.csproj
@@ -106,7 +106,7 @@
..\packages\NuGet.Versioning.3.6.0-octopus-58455\lib\net45\NuGet.Versioning.dll
True
-
+
..\packages\NUnit.2.6.4\lib\nunit.framework.dll
True
@@ -127,8 +127,8 @@
..\packages\Octopus.Diagnostics.1.0.11\lib\netstandard1.0\Octopus.Diagnostics.dll
True
-
- ..\packages\Octopus.Shared.3.13.9-tentsplit0048\lib\Octopus.Shared.dll
+
+ ..\packages\Octopus.Shared.3.14.1-enh-sha256-ui0002\lib\Octopus.Shared.dll
..\packages\Octopus.Time.1.0.8\lib\netstandard1.0\Octopus.Time.dll
diff --git a/source/Octopus.Tentacle.Tests/packages.config b/source/Octopus.Tentacle.Tests/packages.config
index da756abf5..c7ab581ce 100644
--- a/source/Octopus.Tentacle.Tests/packages.config
+++ b/source/Octopus.Tentacle.Tests/packages.config
@@ -42,7 +42,7 @@
-
+
diff --git a/source/Octopus.Tentacle/Commands/RunAgentCommand.cs b/source/Octopus.Tentacle/Commands/RunAgentCommand.cs
index 68a9c838a..1db9ef917 100644
--- a/source/Octopus.Tentacle/Commands/RunAgentCommand.cs
+++ b/source/Octopus.Tentacle/Commands/RunAgentCommand.cs
@@ -74,6 +74,7 @@ protected override void Start()
Environment.SetEnvironmentVariable(EnvironmentVariables.TentacleProgramDirectoryPath, Path.GetDirectoryName(exePath));
Environment.SetEnvironmentVariable(EnvironmentVariables.AgentProgramDirectoryPath, Path.GetDirectoryName(exePath));
Environment.SetEnvironmentVariable(EnvironmentVariables.TentacleVersion, appVersion.ToString());
+ Environment.SetEnvironmentVariable(EnvironmentVariables.TentacleCertificateSignatureAlgorithm, configuration.TentacleCertificate.SignatureAlgorithm.FriendlyName);
Environment.SetEnvironmentVariable(EnvironmentVariables.TentacleProxyUsername, proxyConfiguration.CustomProxyUsername);
Environment.SetEnvironmentVariable(EnvironmentVariables.TentacleProxyPassword, proxyConfiguration.CustomProxyPassword);
Environment.SetEnvironmentVariable(EnvironmentVariables.TentacleProxyHost, proxyConfiguration.CustomProxyHost);
diff --git a/source/Octopus.Tentacle/Octopus.Tentacle.csproj b/source/Octopus.Tentacle/Octopus.Tentacle.csproj
index d37fa60e8..ddd45d660 100644
--- a/source/Octopus.Tentacle/Octopus.Tentacle.csproj
+++ b/source/Octopus.Tentacle/Octopus.Tentacle.csproj
@@ -16,7 +16,7 @@
-
+