diff --git a/tfjs-core/karma.conf.js b/tfjs-core/karma.conf.js
index a11cf53fd7b..90c9992276c 100644
--- a/tfjs-core/karma.conf.js
+++ b/tfjs-core/karma.conf.js
@@ -152,7 +152,9 @@ module.exports = function(config) {
       win_10_chrome: {
         base: 'BrowserStack',
         browser: 'chrome',
-        browser_version: 'latest',
+        // Latest Chrome on Windows has WebGL problems:
+        // https://github.com/tensorflow/tfjs/issues/2272
+        browser_version: '77.0',
         os: 'Windows',
         os_version: '10'
       },
diff --git a/tfjs-core/src/jasmine_util.ts b/tfjs-core/src/jasmine_util.ts
index ce3f9b8c143..30be5143aec 100644
--- a/tfjs-core/src/jasmine_util.ts
+++ b/tfjs-core/src/jasmine_util.ts
@@ -14,11 +14,15 @@
  * limitations under the License.
  * =============================================================================
  */
+
+// tslint:disable-next-line:no-require-imports
+const jasmine = require('jasmine');
 import {KernelBackend} from './backends/backend';
 import {ENGINE} from './engine';
 import {env, Environment, Flags} from './environment';
 
 Error.stackTraceLimit = Infinity;
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
 
 export type Constraints = {
   flags?: Flags,
diff --git a/tfjs-core/src/ops/fused_ops.ts b/tfjs-core/src/ops/fused_ops.ts
index a08d17b6061..d9d4a8079fe 100644
--- a/tfjs-core/src/ops/fused_ops.ts
+++ b/tfjs-core/src/ops/fused_ops.ts
@@ -328,6 +328,7 @@ function conv2d_<T extends Tensor3D|Tensor4D>({
   activation?: Activation,
   preluActivationWeights?: Tensor
 }): T {
+  activation = activation || 'linear';
   if (shouldFuse(ENGINE.state.gradientDepth, activation) === false) {
     let result = unfusedConv2d(
         x, filter, strides, pad, dataFormat, dilations, dimRoundingMode);