diff --git a/spec/integ/matrix-client-opts.spec.js b/spec/integ/matrix-client-opts.spec.js
new file mode 100644
index 000000000..be8e11605
--- /dev/null
+++ b/spec/integ/matrix-client-opts.spec.js
@@ -0,0 +1,50 @@
+"use strict";
+var sdk = require("../..");
+var HttpBackend = require("../mock-request");
+var utils = require("../test-utils");
+
+describe("MatrixClient opts", function() {
+    var baseUrl = "http://localhost.or.something";
+    var client, httpBackend;
+    var userId = "@alice:localhost";
+    var accessToken = "aseukfgwef";
+
+    beforeEach(function() {
+        utils.beforeEach(this);
+        httpBackend = new HttpBackend();
+        sdk.request(httpBackend.requestFn);
+        client = sdk.createClient({
+            baseUrl: baseUrl,
+            userId: userId,
+            accessToken: accessToken
+        });
+    });
+
+    afterEach(function() {
+        httpBackend.verifyNoOutstandingExpectation();
+    });
+
+    describe("without opts.store", function() {
+        xit("should be able to send messages", function() {
+
+        });
+
+        xit("should be able to sync / get new events", function() {
+            // use 'events' emissions.
+        });
+    });
+
+    describe("without opts.scheduler", function() {
+        xit("shouldn't retry sending events", function() {
+
+        });
+
+        xit("shouldn't queue events", function() {
+
+        });
+
+        xit("should be able to send messages", function() {
+
+        });
+    });
+});
diff --git a/spec/integ/matrix-client-retrying.spec.js b/spec/integ/matrix-client-retrying.spec.js
new file mode 100644
index 000000000..8067ca723
--- /dev/null
+++ b/spec/integ/matrix-client-retrying.spec.js
@@ -0,0 +1,47 @@
+"use strict";
+var sdk = require("../..");
+var HttpBackend = require("../mock-request");
+var utils = require("../test-utils");
+
+describe("MatrixClient retrying", function() {
+    var baseUrl = "http://localhost.or.something";
+    var client, httpBackend;
+    var userId = "@alice:localhost";
+    var accessToken = "aseukfgwef";
+
+    beforeEach(function() {
+        utils.beforeEach(this);
+        httpBackend = new HttpBackend();
+        sdk.request(httpBackend.requestFn);
+        client = sdk.createClient({
+            baseUrl: baseUrl,
+            userId: userId,
+            accessToken: accessToken
+        });
+    });
+
+    afterEach(function() {
+        httpBackend.verifyNoOutstandingExpectation();
+    });
+
+    xit("should retry according to MatrixScheduler.retryFn", function() {
+
+    });
+
+    xit("should queue according to MatrixScheduler.queueFn", function() {
+
+    });
+
+    xit("should mark events as EventStatus.NOT_SENT when giving up", function() {
+
+    });
+
+    describe("resending", function() {
+        xit("should be able to resend a NOT_SENT event", function() {
+
+        });
+        xit("should be able to resend a sent event", function() {
+
+        });
+    });
+});