diff --git a/src/frames.ts b/src/frames.ts
index 5dfee22f28..e882718d89 100644
--- a/src/frames.ts
+++ b/src/frames.ts
@@ -27,6 +27,7 @@ import * as network from './network';
 import { Page } from './page';
 import { selectors } from './selectors';
 import * as types from './types';
+import { waitForTimeWasUsed } from './hints';
 
 type ContextType = 'main' | 'utility';
 type ContextData = {
@@ -744,8 +745,10 @@ export class Frame {
   async waitFor(selectorOrFunctionOrTimeout: (string | number | Function), options: types.WaitForFunctionOptions & types.WaitForElementOptions = {}, arg?: any): Promise<js.JSHandle | null> {
     if (helper.isString(selectorOrFunctionOrTimeout))
       return this.waitForSelector(selectorOrFunctionOrTimeout, options) as any;
-    if (helper.isNumber(selectorOrFunctionOrTimeout))
+    if (helper.isNumber(selectorOrFunctionOrTimeout)) {
+      waitForTimeWasUsed();
       return new Promise(fulfill => setTimeout(fulfill, selectorOrFunctionOrTimeout));
+    }
     if (typeof selectorOrFunctionOrTimeout === 'function')
       return this.waitForFunction(selectorOrFunctionOrTimeout as any, arg, options);
     return Promise.reject(new Error('Unsupported target type: ' + (typeof selectorOrFunctionOrTimeout)));
diff --git a/src/hints.ts b/src/hints.ts
new file mode 100644
index 0000000000..38fc4b83f5
--- /dev/null
+++ b/src/hints.ts
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import * as debug from 'debug';
+
+export const debugHints = debug('pw:hints');
+(debugHints as any).color = '11';
+
+let waitForTimeWasUsedReported = false;
+export function waitForTimeWasUsed() {
+  if (waitForTimeWasUsedReported)
+    return;
+  waitForTimeWasUsedReported = true;
+  debugHints(`WARNING: page.waitFor(timeout) should only be used for debugging.
+It is likely that the tests using timer in production are going to be flaky.
+Use signals such as network events, selectors becoming visible, etc. instead.`);
+}