diff --git a/TGServerService/InstanceConfig.cs b/TGServerService/InstanceConfig.cs
index 69c6cf2ae7..a7afc8ab5f 100644
--- a/TGServerService/InstanceConfig.cs
+++ b/TGServerService/InstanceConfig.cs
@@ -7,7 +7,7 @@ namespace TGServerService
 	/// <summary>
 	/// Configuration settings for a <see cref="ServerInstance"/>
 	/// </summary>
-	interface IInstanceConfig
+	public interface IInstanceConfig
 	{
 		/// <summary>
 		/// The <see cref="ServerInstance"/> directory this <see cref="IInstanceConfig"/> is for
diff --git a/TGServiceTests/Service/TestServerInstance.cs b/TGServiceTests/Service/TestServerInstance.cs
index 27b79b6c4b..e8c8629549 100644
--- a/TGServiceTests/Service/TestServerInstance.cs
+++ b/TGServiceTests/Service/TestServerInstance.cs
@@ -1,4 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
 using TGServiceTests;
 
 namespace TGServerService.Tests
@@ -17,5 +18,33 @@ namespace TGServerService.Tests
 		{
 			new ServerInstance(new InstanceConfig(TempPath), 1).Dispose();
 		}
+
+		/// <summary>
+		/// Test the return value of <see cref="ServerInstance.PushTestmergeCommits"/>
+		/// </summary>
+		[TestMethod]
+		public void TestPushTestMergeCommits()
+		{
+			var ic = new InstanceConfig(TempPath) { PushTestmergeCommits = false };
+			using (var si = new ServerInstance(ic, 1))
+			{
+				Assert.IsFalse(si.PushTestmergeCommits());
+				ic.PushTestmergeCommits = true;
+				Assert.IsTrue(si.PushTestmergeCommits());
+			}
+		}
+
+		[TestMethod]
+		public void TestSetPushTestMergeCommits()
+		{
+			var ic = new InstanceConfig(TempPath) { PushTestmergeCommits = false };
+			using (var si = new ServerInstance(ic, 1))
+			{
+				si.SetPushTestmergeCommits(true);
+				Assert.IsTrue(ic.PushTestmergeCommits);
+				si.SetPushTestmergeCommits(false);
+				Assert.IsFalse(ic.PushTestmergeCommits);
+			}
+		}
 	}
 }