diff --git a/bluebird/bluebird-1.0-tests.ts b/bluebird/bluebird-1.0-tests.ts
index f04317f6a..2aa795a4f 100644
--- a/bluebird/bluebird-1.0-tests.ts
+++ b/bluebird/bluebird-1.0-tests.ts
@@ -504,7 +504,16 @@ fooArrProm = fooArrProm.filter<Foo>((item: Foo) => {
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
+function getMaybePromise(): Foo|Promise<Foo> {
+    return foo;
+}
 
+fooProm = Promise.try(() => {
+	return getMaybePromise();
+});
+fooProm = Promise.try<Foo>(() => {
+	return getMaybePromise();
+});
 fooProm = Promise.try(() => {
 	return foo;
 });
@@ -529,6 +538,12 @@ fooProm = Promise.try(() => {
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
+fooProm = Promise.attempt(() => {
+	return getMaybePromise();
+});
+fooProm = Promise.attempt<Foo>(() => {
+	return getMaybePromise();
+});
 fooProm = Promise.attempt(() => {
 	return foo;
 });
diff --git a/bluebird/bluebird-1.0.d.ts b/bluebird/bluebird-1.0.d.ts
index b8287e57c..7979e8b6f 100644
--- a/bluebird/bluebird-1.0.d.ts
+++ b/bluebird/bluebird-1.0.d.ts
@@ -319,11 +319,9 @@ declare class Promise<R> implements Promise.Thenable<R> {
 	 *
 	 * Alias for `attempt();` for compatibility with earlier ECMAScript version.
 	 */
-	static try<R>(fn: () => Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>;
-	static try<R>(fn: () => R, args?: any[], ctx?: any): Promise<R>;
+	static try<R>(fn: () => R | Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>;
 
-	static attempt<R>(fn: () => Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>;
-	static attempt<R>(fn: () => R, args?: any[], ctx?: any): Promise<R>;
+	static attempt<R>(fn: () => R | Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>;
 
 	/**
 	 * Returns a new function that wraps the given function `fn`. The new function will always return a promise that is fulfilled with the original functions return values or rejected with thrown exceptions from the original function.
diff --git a/bluebird/bluebird-tests.ts b/bluebird/bluebird-tests.ts
index 9244a9da3..a24cdfd7e 100644
--- a/bluebird/bluebird-tests.ts
+++ b/bluebird/bluebird-tests.ts
@@ -673,7 +673,16 @@ fooArrProm = fooArrProm.each<Foo, Bar>((item: Foo, index: number, arrayLength: n
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
+function getMaybePromise(): Foo|Promise<Foo> {
+    return foo;
+}
 
+fooProm = Promise.try(() => {
+	return getMaybePromise();
+});
+fooProm = Promise.try<Foo>(() => {
+	return getMaybePromise();
+});
 fooProm = Promise.try(() => {
 	return foo;
 });
@@ -707,6 +716,12 @@ fooProm = Promise.try(() => {
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
+fooProm = Promise.attempt(() => {
+	return getMaybePromise();
+});
+fooProm = Promise.attempt<Foo>(() => {
+	return getMaybePromise();
+});
 fooProm = Promise.attempt(() => {
 	return foo;
 });