diff --git a/scripts/docker/fedora.23/Dockerfile b/scripts/docker/fedora.23/Dockerfile
index 0c4b20d79..b8508bde7 100644
--- a/scripts/docker/fedora.23/Dockerfile
+++ b/scripts/docker/fedora.23/Dockerfile
@@ -4,36 +4,10 @@
 #
 
 # Dockerfile that creates a container suitable to build dotnet-cli
-FROM fedora:23
-
-# Install the base toolchain we need to build anything (clang, cmake, make and the like)
-# this does not include libraries that we need to compile different projects, we'd like
-# them in a different layer.
-RUN dnf install -y cmake \
-        clang \
-        lldb-devel \
-        make \
-        which && \
-    dnf clean all
+FROM microsoft/dotnet-buildtools-prereqs:fedora23_prereqs
 
 # Install tools used by the VSO build automation.
-RUN dnf install -y git \
-        zip \
-        tar \
-        nodejs \
-        findutils \
-        npm && \
-    dnf clean all && \
-    npm install -g azure-cli && \
-    npm cache clean
-
-# Dependencies of CoreCLR and CoreFX.
-RUN dnf install -y libicu-devel \
-        libuuid-devel \
-        libcurl-devel \
-        openssl-devel \
-        libunwind-devel \
-        lttng-ust-devel && \
+RUN dnf install -y findutils && \
     dnf clean all
 
 # Upgrade NSS, used for SSL, to avoid NuGet restore timeouts.
diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs
index 9121df32e..c432cfd53 100644
--- a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs
+++ b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs
@@ -31,6 +31,10 @@ namespace Microsoft.DotNet.New.Tests
         [InlineData("F#", "mstest", false, false)]
         [InlineData("F#", "xunit", false, false)]
         [InlineData("F#", "mvc", true, false)]
+        [InlineData("VB", "console", false)]
+        [InlineData("VB", "classlib", false)]
+        [InlineData("VB", "mstest", false)]
+        [InlineData("VB", "xunit", false)]
         public void TemplateRestoresAndBuildsWithoutWarnings(
             string language,
             string projectType,