diff --git a/.drone.yml b/.drone.yml
index 0165008588..f31d948f66 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -782,6 +782,8 @@ matrix:
     - TESTS: carddavtester-old-endpoint
     - TESTS: object-store
       OBJECT_STORE: s3
+    - TESTS: object-store
+      OBJECT_STORE: azure
 #    - TESTS: object-store
 #      OBJECT_STORE: swift
 #      SWIFT-AUTH: v2.0
@@ -883,6 +885,13 @@ services:
       when:
         matrix:
           OBJECT_STORE: s3
+  azurite:
+      image: arafato/azurite
+      environment:
+      - executable=blob
+      when:
+        matrix:
+          OBJECT_STORE: azure
   dockswift:
       image: icewind1991/dockswift:nextcloud-ci
       environment:
diff --git a/autotest.sh b/autotest.sh
index d8f62ce236..8958121a5b 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -369,6 +369,9 @@ function execute_tests {
 	if [ "$TEST_SELECTION" == "PRIMARY-s3" ]; then
 		GROUP='--group PRIMARY-s3'
 	fi
+	if [ "$TEST_SELECTION" == "PRIMARY-azure" ]; then
+		GROUP='--group PRIMARY-azure'
+	fi
 	if [ "$TEST_SELECTION" == "PRIMARY-swift" ]; then
 		GROUP='--group PRIMARY-swift'
 	fi
diff --git a/lib/private/Files/ObjectStore/Azure.php b/lib/private/Files/ObjectStore/Azure.php
index 0868f92eac..899c826ec1 100644
--- a/lib/private/Files/ObjectStore/Azure.php
+++ b/lib/private/Files/ObjectStore/Azure.php
@@ -22,6 +22,7 @@
 namespace OC\Files\ObjectStore;
 
 use MicrosoftAzure\Storage\Blob\BlobRestProxy;
+use MicrosoftAzure\Storage\Common\Exceptions\ServiceException;
 use OCP\Files\ObjectStore\IObjectStore;
 
 class Azure implements IObjectStore {
@@ -33,6 +34,10 @@ class Azure implements IObjectStore {
 	private $accountKey;
 	/** @var BlobRestProxy|null */
 	private $blobClient = null;
+	/** @var string|null */
+	private $endpoint = null;
+	/** @var bool  */
+	private $autoCreate = false;
 
 	/**
 	 * @param array $parameters
@@ -41,6 +46,12 @@ class Azure implements IObjectStore {
 		$this->containerName = $parameters['container'];
 		$this->accountName = $parameters['account_name'];
 		$this->accountKey = $parameters['account_key'];
+		if (isset($parameters['endpoint'])) {
+			$this->endpoint = $parameters['endpoint'];
+		}
+		if (isset($parameters['autocreate'])) {
+			$this->autoCreate = $parameters['autocreate'];
+		}
 	}
 
 	/**
@@ -48,8 +59,24 @@ class Azure implements IObjectStore {
 	 */
 	private function getBlobClient() {
 		if (!$this->blobClient) {
-			$connectionString = "DefaultEndpointsProtocol=https;AccountName=" . $this->accountName . ";AccountKey=" . $this->accountKey;
+			$protocol = $this->endpoint ? substr($this->endpoint, 0, strpos($this->endpoint, ':')) : 'https';
+			$connectionString = "DefaultEndpointsProtocol=" . $protocol . ";AccountName=" . $this->accountName . ";AccountKey=" . $this->accountKey;
+			if ($this->endpoint) {
+				$connectionString .= ';BlobEndpoint=' . $this->endpoint;
+			}
 			$this->blobClient = BlobRestProxy::createBlobService($connectionString);
+
+			if ($this->autoCreate) {
+				try {
+					$this->blobClient->createContainer($this->containerName);
+				} catch (ServiceException $e) {
+					if ($e->getCode() === 409) {
+						// already exists
+					} else {
+						throw $e;
+					}
+				}
+			}
 		}
 		return $this->blobClient;
 	}
diff --git a/tests/lib/Files/ObjectStore/AzureTest.php b/tests/lib/Files/ObjectStore/AzureTest.php
new file mode 100644
index 0000000000..716d06f48c
--- /dev/null
+++ b/tests/lib/Files/ObjectStore/AzureTest.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @copyright Copyright (c) 2018 Robin Appelman <robin@icewind.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Test\Files\ObjectStore;
+
+use OC\Files\ObjectStore\Azure;
+
+/**
+ * @group PRIMARY-azure
+ */
+class AzureTest extends ObjectStoreTest {
+	protected function getInstance() {
+		$config = \OC::$server->getConfig()->getSystemValue('objectstore');
+		if (!is_array($config) || $config['class'] !== 'OC\\Files\\ObjectStore\\Azure') {
+			$this->markTestSkipped('objectstore not configured for azure');
+		}
+
+		return new Azure($config['arguments']);
+	}
+}
diff --git a/tests/preseed-config.php b/tests/preseed-config.php
index 779868310d..70cf272fae 100644
--- a/tests/preseed-config.php
+++ b/tests/preseed-config.php
@@ -72,3 +72,15 @@ if (getenv('OBJECT_STORE') === 'swift') {
 		];
 	}
 }
+if (getenv('OBJECT_STORE') === 'azure') {
+	$CONFIG['objectstore'] = [
+		'class' => 'OC\\Files\\ObjectStore\\Azure',
+		'arguments' => array(
+			'container' => 'test',
+			'account_name' => 'devstoreaccount1',
+			'account_key' => 'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==',
+			'endpoint' => 'http://' . (getenv('DRONE') === 'true' ? 'azurite' : 'localhost') . ':10000/devstoreaccount1',
+			'autocreate' => true
+		)
+	];
+}