diff --git a/Discord.Net.targets b/Discord.Net.targets
index 867af36ec..15591afc2 100644
--- a/Discord.Net.targets
+++ b/Discord.Net.targets
@@ -2,8 +2,6 @@
     <PropertyGroup>
         <VersionPrefix>1.0.0</VersionPrefix>
         <VersionSuffix>rc</VersionSuffix>
-        <VersionSuffix Condition="'$(BuildNumber)' == ''">$(VersionSuffix)-dev</VersionSuffix>
-        <VersionSuffix Condition="'$(BuildNumber)' != '' And $(IsTagBuild) != 'true'">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
         <Authors>RogueException</Authors>
         <PackageTags>discord;discordapp</PackageTags>
         <PackageProjectUrl>https://github.com/RogueException/Discord.Net</PackageProjectUrl>
@@ -12,6 +10,14 @@
         <RepositoryUrl>git://github.com/RogueException/Discord.Net</RepositoryUrl>
         <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
     </PropertyGroup>
+    <PropertyGroup Condition=" '$(BuildNumber)' == '' ">
+        <VersionSuffix Condition=" '$(VersionSuffix)' == ''">dev</VersionSuffix>
+        <VersionSuffix Condition=" '$(VersionSuffix)' != ''">$(VersionSuffix)-dev</VersionSuffix>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(BuildNumber)' != '' And $(IsTagBuild) != 'true' ">
+        <VersionSuffix Condition=" '$(VersionSuffix)' == '' ">$(BuildNumber)</VersionSuffix>
+        <VersionSuffix Condition=" '$(VersionSuffix)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
+    </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
         <NoWarn>$(NoWarn);CS1573;CS1591</NoWarn>
         <WarningsAsErrors>true</WarningsAsErrors>
diff --git a/test.ps1 b/test.ps1
index b8a817743..d73a01f23 100644
--- a/test.ps1
+++ b/test.ps1
@@ -1,2 +1,2 @@
-dotnet test test/Discord.Net.Tests/Discord.Net.Tests.csproj -c "Release" --no-build /p:BuildNumber="$Env:BUILD"
+dotnet test test/Discord.Net.Tests/Discord.Net.Tests.csproj -c "Release" --no-build /p:BuildNumber="$Env:BUILD" /p:IsTagBuild="$Env:APPVEYOR_REPO_TAG"
 if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
\ No newline at end of file