diff --git a/tests/Oryx.Integration.Tests/NodeEndToEndTests.cs b/tests/Oryx.Integration.Tests/NodeEndToEndTests.cs
index b41f9677ea..cfd20d05aa 100644
--- a/tests/Oryx.Integration.Tests/NodeEndToEndTests.cs
+++ b/tests/Oryx.Integration.Tests/NodeEndToEndTests.cs
@@ -253,8 +253,10 @@ await EndToEndTestHelper.BuildRunAndAssertAppAsync(
                 });
         }
 
-        [Fact]
-        public async Task CanBuildAndRun_NodeApp_WithBuildpack()
+        [Theory]
+        [InlineData("oryxdevms/pack-builder")]
+        [InlineData("heroku/buildpacks")]
+        public async Task CanBuildAndRun_NodeApp_WithBuildpack(string builder)
         {
             // Arrange
             var appName = "webfrontend";
@@ -273,9 +275,9 @@ await EndToEndTestHelper.BuildRunAndAssertAppAsync(
                 new[]
                 {
                     "build", appImageName,
-                    "--no-pull", "--no-color",
+                    "--no-color",
                     "--path", appVolume.ContainerDir,
-                    "--builder", "oryxdevms/pack-builder"
+                    "--builder", builder
                 },
                 appImageName,
                 8080,
diff --git a/tests/SampleApps/nodejs/webfrontend/server.js b/tests/SampleApps/nodejs/webfrontend/server.js
index 887efaceff..d05749b648 100644
--- a/tests/SampleApps/nodejs/webfrontend/server.js
+++ b/tests/SampleApps/nodejs/webfrontend/server.js
@@ -10,7 +10,7 @@ app.get('/api', function (req, res) {
     res.send('Hello from webfrontend');
 });
 
-var port = process.env.PORT || 80;
+var port = process.env.PORT || 8080;
 var server = app.listen(port, function () {
     console.log('Listening on port ' + port);
 });