diff --git a/GitVersionCore.Tests/GitVersionCore.Tests.csproj b/GitVersionCore.Tests/GitVersionCore.Tests.csproj
index 3ac0dd7621..364b1aa318 100644
--- a/GitVersionCore.Tests/GitVersionCore.Tests.csproj
+++ b/GitVersionCore.Tests/GitVersionCore.Tests.csproj
@@ -74,6 +74,7 @@
     <Compile Include="GitDirFinderTests.cs" />
     <Compile Include="Fixtures\BaseGitFlowRepositoryFixture.cs" />
     <Compile Include="IntegrationTests\GitFlow\DevelopScenarios.cs" />
+    <Compile Include="IntegrationTests\GitFlow\FeatureBranchTests.cs" />
     <Compile Include="IntegrationTests\GitFlow\SupportBranchScenarios.cs" />
     <Compile Include="IntegrationTests\GitFlow\MetaDataByCommitScenarios.cs" />
     <Compile Include="IntegrationTests\GitFlow\PatchScenarios.cs" />
diff --git a/GitVersionCore.Tests/IntegrationTests/GitFlow/FeatureBranchTests.cs b/GitVersionCore.Tests/IntegrationTests/GitFlow/FeatureBranchTests.cs
new file mode 100644
index 0000000000..4cfe622ae9
--- /dev/null
+++ b/GitVersionCore.Tests/IntegrationTests/GitFlow/FeatureBranchTests.cs
@@ -0,0 +1,32 @@
+using GitVersion;
+using LibGit2Sharp;
+using NUnit.Framework;
+
+[TestFixture]
+public class FeatureBranchTests
+{
+    [Test]
+    public void ShouldNotUseNumberInFeatureBranchAsPreReleaseNumber()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.0");
+            fixture.Repository.CreateBranch("develop");
+            fixture.Repository.Checkout("develop");
+            fixture.Repository.CreateBranch("feature/JIRA-123");
+            fixture.Repository.Checkout("feature/JIRA-123");
+            fixture.Repository.MakeCommits(5);
+
+            // Current output 1.1.0-JIRA-.123+5
+
+            // A valid assert from my point of view
+            fixture.AssertFullSemver("1.1.0-JIRA-123.5");
+
+            // Or possible, but I'll guess it depends on wheter we're using a CD och CI flow?
+            // fixture.AssertFullSemver("1.1.0-JIRA-123+5");
+
+            // Or depending on how we treat the build number meta data
+            // fixture.AssertFullSemver("1.1.0-JIRA-123.5+5");
+        }
+    }    
+}
\ No newline at end of file