diff --git a/amqplib/amqplib-tests.ts b/amqplib/amqplib-tests.ts
index f99a3bde1a..85763c9ee1 100644
--- a/amqplib/amqplib-tests.ts
+++ b/amqplib/amqplib-tests.ts
@@ -5,6 +5,7 @@ import amqp = require("amqplib");
 
 var msg = "Hello World";
 
+// test promise api
 amqp.connect("amqp://localhost")
     .then(connection => {
         return connection.createChannel()
@@ -21,6 +22,13 @@ amqp.connect("amqp://localhost")
             .ensure(() => connection.close());
     });
 
+// test promise api properties
+var amqpMessage: amqp.Message;
+amqpMessage.properties.contentType = "application/json";
+var amqpAssertExchangeOptions: amqp.Options.AssertExchange;
+var anqpAssertExchangeReplies: amqp.Replies.AssertExchange;
+
+
 // callback api tests
 import amqpcb = require("amqplib/callback_api");
 
@@ -51,3 +59,9 @@ amqpcb.connect("amqp://localhost", (err, connection) => {
         });
     }
 });
+
+// test callback api properties
+var amqpcbMessage: amqpcb.Message;
+amqpcbMessage.properties.contentType = "application/json";
+var amqpcbAssertExchangeOptions: amqpcb.Options.AssertExchange;
+var anqpcbAssertExchangeReplies: amqpcb.Replies.AssertExchange;
\ No newline at end of file
diff --git a/amqplib/amqplib.d.ts b/amqplib/amqplib.d.ts
index f125aaa070..d03c46ed79 100644
--- a/amqplib/amqplib.d.ts
+++ b/amqplib/amqplib.d.ts
@@ -66,7 +66,7 @@ declare module "amqplib/properties" {
 
             contentType?: string;
             contentEncoding?: string;
-            headers?: Object;
+            headers?: any;
             priority?: number;
             correlationId?: string;
             replyTo?: string;
@@ -81,7 +81,7 @@ declare module "amqplib/properties" {
             noAck?: boolean;
             exclusive?: boolean;
             priority?: number;
-            arguments?: Object;
+            arguments?: any;
         }
         interface Get {
             noAck?: boolean;
@@ -90,8 +90,8 @@ declare module "amqplib/properties" {
 
     interface Message {
         content: Buffer;
-        fields: Object;
-        properties: Object;
+        fields: any;
+        properties: any;
     }
 }
 
@@ -100,9 +100,9 @@ declare module "amqplib" {
     import events = require("events");
     import when = require("when");
     import shared = require("amqplib/properties")
-    import Replies = shared.Replies;
-    import Options = shared.Options;
-    import Message = shared.Message;
+    export import Replies = shared.Replies;
+    export import Options = shared.Options;
+    export import Message = shared.Message;
 
     interface Connection extends events.EventEmitter {
         close(): when.Promise<void>;
@@ -156,9 +156,9 @@ declare module "amqplib/callback_api" {
 
     import events = require("events");
     import shared = require("amqplib/properties")
-    import Replies = shared.Replies;
-    import Options = shared.Options;
-    import Message = shared.Message;
+    export import Replies = shared.Replies;
+    export import Options = shared.Options;
+    export import Message = shared.Message;
 
     interface Connection extends events.EventEmitter {
         close(callback?: (err: any) => void): void;