diff --git a/src/GitVersionCore.Tests/IntegrationTests/FeatureBranchScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/FeatureBranchScenarios.cs
index fa2ac953e4..36df8e9269 100644
--- a/src/GitVersionCore.Tests/IntegrationTests/FeatureBranchScenarios.cs
+++ b/src/GitVersionCore.Tests/IntegrationTests/FeatureBranchScenarios.cs
@@ -199,4 +199,43 @@ public void ShouldUseConfiguredTag(string tag, string featureName, string preRel
             fixture.AssertFullSemver(config, expectedFullSemVer);
         }
     }
+
+    [Test]
+    public void BranchCreatedAfterFinishReleaseShouldInheritAndIncrementFromLastMasterCommitTag()
+    {
+        using (var fixture = new BaseGitFlowRepositoryFixture("0.1.0"))
+        {
+            //validate current version
+            fixture.AssertFullSemver("0.2.0-unstable.1");
+            fixture.Repository.CreateBranch("release/0.2.0");
+            fixture.Repository.Checkout("release/0.2.0");
+
+            //validate release version
+            fixture.AssertFullSemver("0.2.0-beta.1+0");
+
+            fixture.Checkout("master");
+            fixture.Repository.MergeNoFF("release/0.2.0");
+            fixture.Repository.ApplyTag("0.2.0");
+
+            //validate master branch version
+            fixture.AssertFullSemver("0.2.0");
+
+            fixture.Checkout("develop");
+            fixture.Repository.MergeNoFF("release/0.2.0");
+
+            fixture.Repository.MakeACommit();
+
+            //validate develop branch version after merging release 0.2.0 to master and develop (finish release)
+            fixture.AssertFullSemver("0.3.0-unstable.1");
+
+            //create a feature branch from develop
+            fixture.Repository.CreateBranch("feature/TEST-1");
+            fixture.Repository.Checkout("feature/TEST-1");
+            fixture.Repository.MakeACommit();
+
+            //I'm not entirely sure what the + value should be but I know the semvar major/minor/patch should be 0.3.0
+            fixture.AssertFullSemver("0.3.0-TEST-1.1+3");
+
+        }
+    }
 }
\ No newline at end of file