diff --git a/VirtoCommerce.Storefront.Model/VirtoCommerce.Storefront.Model.csproj b/VirtoCommerce.Storefront.Model/VirtoCommerce.Storefront.Model.csproj
index 5fa3eef3..a90b0947 100644
--- a/VirtoCommerce.Storefront.Model/VirtoCommerce.Storefront.Model.csproj
+++ b/VirtoCommerce.Storefront.Model/VirtoCommerce.Storefront.Model.csproj
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,6 +30,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="CacheManager.Core, Version=0.9.3.0, Culture=neutral, PublicKeyToken=5b450b4fb65c4cdb, processorArchitecture=MSIL">
diff --git a/VirtoCommerce.Storefront.Test/ProductAvailabilityTests.cs b/VirtoCommerce.Storefront.Test/ProductAvailabilityTests.cs
index d898b65a..5573fc0e 100644
--- a/VirtoCommerce.Storefront.Test/ProductAvailabilityTests.cs
+++ b/VirtoCommerce.Storefront.Test/ProductAvailabilityTests.cs
@@ -1,6 +1,4 @@
 using VirtoCommerce.Storefront.Model.Catalog;
-using VirtoCommerce.Storefront.Model.Catalog.Services;
-using VirtoCommerce.Storefront.Services;
 using Xunit;
 
 namespace VirtoCommerce.Storefront.Test
@@ -75,10 +73,5 @@ private static Product CreateProduct(bool isActive, bool isBuyable, bool trackIn
 
             return result;
         }
-
-        private static IProductAvailabilityService GetProductAvailabilityService()
-        {
-            return new ProductAvailabilityService();
-        }
     }
 }
diff --git a/VirtoCommerce.Storefront.Test/VirtoCommerce.Storefront.Test.csproj b/VirtoCommerce.Storefront.Test/VirtoCommerce.Storefront.Test.csproj
index 94151919..3b05e14a 100644
--- a/VirtoCommerce.Storefront.Test/VirtoCommerce.Storefront.Test.csproj
+++ b/VirtoCommerce.Storefront.Test/VirtoCommerce.Storefront.Test.csproj
@@ -24,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -32,6 +33,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">