diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
index 8c5e208ef0..a8f232f2cb 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
@@ -83,6 +83,14 @@ public class BenchmarkRunner {
                 .withOptionalArg().defaultsTo("");
         OptionSpec<String> rdbjdbctableprefix = parser.accepts("rdbjdbctableprefix", "RDB JDBC table prefix")
                 .withOptionalArg().defaultsTo("");
+
+        OptionSpec<String> azureConnectionString = parser.accepts("azure", "Azure Connection String")
+                .withOptionalArg().defaultsTo("DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://127.0.0.1:10000/devstoreaccount1;");
+        OptionSpec<String> azureContainerName = parser.accepts("azureContainerName", "Azure container name")
+                .withOptionalArg().defaultsTo("oak");
+        OptionSpec<String> azureRootPath = parser.accepts("azureRootPath", "Azure root path")
+                .withOptionalArg().defaultsTo("/oak");
+
         OptionSpec<Boolean> mmap = parser.accepts("mmap", "TarMK memory mapping")
                 .withOptionalArg().ofType(Boolean.class)
                 .defaultsTo("64".equals(System.getProperty("sun.arch.data.model")));
@@ -230,6 +238,11 @@ public class BenchmarkRunner {
                         mmap.value(options), coldUseDataStore.value(options), fdsCache.value(options), 
                         coldSyncInterval.value(options), coldShareDataStore.value(options), coldSecure.value(options), 
                         coldOneShotRun.value(options)),
+                OakRepositoryFixture.getSegmentTarWithAzureSegmentStore(base.value(options),
+                        azureConnectionString.value(options),
+                        azureContainerName.value(options),
+                        azureRootPath.value(options),
+                        256, cacheSize, true, fdsCache.value(options)),
                 OakRepositoryFixture.getRDB(rdbjdbcuri.value(options), rdbjdbcuser.value(options),
                         rdbjdbcpasswd.value(options), rdbjdbctableprefix.value(options), 
                         dropDBAfterTest.value(options), cacheSize * MB, vgcMaxAge.value(options)),
diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java
index 4ffbc987ca..60acc379ef 100644
--- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java
+++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FixturesHelper.java
@@ -43,7 +43,7 @@ public final class FixturesHelper {
      * default fixtures when no {@code nsfixtures} is provided
      */
     public enum Fixture {
-       DOCUMENT_NS, @Deprecated SEGMENT_MK, DOCUMENT_RDB, MEMORY_NS, DOCUMENT_MEM, SEGMENT_TAR, COMPOSITE_SEGMENT, COMPOSITE_MEM, COW_DOCUMENT
+       DOCUMENT_NS, @Deprecated SEGMENT_MK, DOCUMENT_RDB, MEMORY_NS, DOCUMENT_MEM, SEGMENT_TAR, SEGMENT_AZURE, COMPOSITE_SEGMENT, COMPOSITE_MEM, COW_DOCUMENT
     }
 
     private static final Set<Fixture> FIXTURES;
diff --git a/oak-it/pom.xml b/oak-it/pom.xml
index acd5e60fb8..0f0930da85 100644
--- a/oak-it/pom.xml
+++ b/oak-it/pom.xml
@@ -62,6 +62,12 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.jackrabbit</groupId>
+            <artifactId>oak-segment-azure</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>oak-store-document</artifactId>
@@ -115,6 +121,13 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.jackrabbit</groupId>
+            <artifactId>oak-segment-azure</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>oak-blob-cloud</artifactId>
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java
index f190fc5088..cf79b43eb5 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixtures.java
@@ -31,6 +31,7 @@ import org.apache.jackrabbit.oak.fixture.MemoryFixture;
 import org.apache.jackrabbit.oak.fixture.NodeStoreFixture;
 import org.apache.jackrabbit.oak.composite.CompositeMemoryStoreFixture;
 import org.apache.jackrabbit.oak.composite.CompositeSegmentStoreFixture;
+import org.apache.jackrabbit.oak.segment.azure.fixture.SegmentAzureFixture;
 import org.apache.jackrabbit.oak.segment.fixture.SegmentTarFixture;
 
 public class NodeStoreFixtures {
@@ -39,6 +40,8 @@ public class NodeStoreFixtures {
 
     public static final NodeStoreFixture SEGMENT_TAR = new SegmentTarFixture();
 
+    public static final NodeStoreFixture SEGMENT_AZURE = new SegmentAzureFixture();
+
     public static final NodeStoreFixture DOCUMENT_NS = new DocumentMongoFixture();
 
     public static final NodeStoreFixture DOCUMENT_RDB = new DocumentRdbFixture();
@@ -68,6 +71,9 @@ public class NodeStoreFixtures {
         if (fixtures.contains(FixturesHelper.Fixture.SEGMENT_TAR)) {
             configuredFixtures.add(SEGMENT_TAR);
         }
+        if (fixtures.contains(FixturesHelper.Fixture.SEGMENT_AZURE)) {
+            configuredFixtures.add(SEGMENT_AZURE);
+        }
         if (fixtures.contains(FixturesHelper.Fixture.COMPOSITE_SEGMENT)) {
             configuredFixtures.add(COMPOSITE_SEGMENT);
         }
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
index 79d8325c35..b0dfc23158 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
@@ -458,7 +458,7 @@ public class NodeStoreTest extends OakBaseTest {
         NodeBuilder x = test.getChildNode("x");
         if (fixture == NodeStoreFixtures.SEGMENT_TAR || fixture == NodeStoreFixtures.MEMORY_NS 
                 || fixture == NodeStoreFixtures.COMPOSITE_MEM || fixture == NodeStoreFixtures.COMPOSITE_SEGMENT
-                || fixture == NodeStoreFixtures.COW_DOCUMENT) {
+                || fixture == NodeStoreFixtures.COW_DOCUMENT || fixture == NodeStoreFixtures.SEGMENT_AZURE) {
             assertTrue(x.moveTo(x, "xx"));
             assertFalse(x.exists());
             assertFalse(test.hasChildNode("x"));
diff --git a/oak-jcr/pom.xml b/oak-jcr/pom.xml
index ce42e3da9d..be22efadd7 100644
--- a/oak-jcr/pom.xml
+++ b/oak-jcr/pom.xml
@@ -261,6 +261,12 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>oak-segment-azure</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>oak-store-document</artifactId>
@@ -293,6 +299,13 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>oak-segment-azure</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>oak-store-document</artifactId>
diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
index 31f13942ac..048161a9b6 100644
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@ -66,7 +66,7 @@
    <!-- specifies on which fixture to run the integration testing tests. 
       override in profiles or provide from command line to change behaviour. Provide 
       more fixtures space separated. See org.apache.jackrabbit.oak.jcr.FixturesHelper#AVAILABLE_FIXTURES 
-      for the possible values: SEGMENT_MK SEGMENT_TAR DOCUMENT_NS DOCUMENT_RDB -->
+      for the possible values: SEGMENT_MK SEGMENT_TAR SEGMENT_AZURE DOCUMENT_NS DOCUMENT_RDB -->
     <fixtures>SEGMENT_TAR</fixtures>
 
    <!-- whether skip the surefire unit testing during the integration testing. 
diff --git a/oak-run-commons/pom.xml b/oak-run-commons/pom.xml
index 547c938040..9399c7947d 100644
--- a/oak-run-commons/pom.xml
+++ b/oak-run-commons/pom.xml
@@ -57,6 +57,11 @@
             <artifactId>oak-segment-tar</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.jackrabbit</groupId>
+            <artifactId>oak-segment-azure</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>oak-store-document</artifactId>
diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
index 2643df0cbe..682aec7199 100644
--- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
+++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
@@ -66,6 +66,7 @@ public abstract class OakFixture {
     public static final String OAK_RDB_DS = "Oak-RDB-DS";
 
     public static final String OAK_SEGMENT_TAR = "Oak-Segment-Tar";
+    public static final String OAK_SEGMENT_AZURE = "Oak-Segment-Azure";
     public static final String OAK_SEGMENT_TAR_DS = "Oak-Segment-Tar-DS";
     public static final String OAK_SEGMENT_TAR_COLD = "Oak-Segment-Tar-Cold";
 
@@ -346,6 +347,17 @@ public abstract class OakFixture {
                 dsCacheInMB, true, syncInterval, shareBlobStore, secure, oneShotRun);
     }
 
+    public static OakFixture getSegmentTarWithAzureSegmentStore(final File base, final String azureConnectionString, final String azureContainerName, final String azureRootPath,
+                                                                final int maxFileSizeMB, final int cacheSizeMB, final boolean useBlobStore, final int dsCacheInMB) {
+        return SegmentTarFixtureBuilder
+                .segmentTarFixtureBuilder(OakFixture.OAK_SEGMENT_AZURE, base)
+                .withAzure(azureConnectionString, azureContainerName, azureRootPath)
+                .withMaxFileSize(maxFileSizeMB)
+                .withSegmentCacheSize(cacheSizeMB)
+                .withBlobStore(useBlobStore)
+                .withDSCacheSize(dsCacheInMB).build();
+    }
+
     public static OakFixture getCompositeStore(final String name, final File base,
                                                final int maxFileSizeMB, final int cacheSizeMB, final boolean memoryMapping,
                                                final int mounts, final int pathsPerMount) {
diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java
index 4222743f3b..6840251afb 100644
--- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java
+++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java
@@ -113,6 +113,14 @@ public class OakRepositoryFixture implements RepositoryFixture {
                 memoryMapping, useBlobStore, dsCacheInMB, syncInterval, shareBlobStore, secure, oneShotRun));
     }
 
+    public static RepositoryFixture getSegmentTarWithAzureSegmentStore(final File base, final String azureConnectionString,
+                                                                       final String azureContainerName, final String azureRootPath,
+                                                                       final int maxFileSizeMB, final int cacheSizeMB, final boolean useBlobStore,
+                                                                       final int dsCacheInMB) {
+        return new OakRepositoryFixture(OakFixture.getSegmentTarWithAzureSegmentStore(base, azureConnectionString,
+                azureContainerName, azureRootPath, maxFileSizeMB, cacheSizeMB, useBlobStore, dsCacheInMB));
+    }
+
     public static RepositoryFixture getCompositeStore(File base, int maxFileSizeMB, int cacheSizeMB,
                                                       final boolean memoryMapping, int mounts, int pathsPerMount) {
         return new OakRepositoryFixture(OakFixture.getCompositeStore(OakFixture.OAK_COMPOSITE_STORE,
diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/SegmentTarFixture.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/SegmentTarFixture.java
index e5c376115a..7226ae2b04 100644
--- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/SegmentTarFixture.java
+++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/fixture/SegmentTarFixture.java
@@ -30,6 +30,9 @@ import java.util.concurrent.TimeUnit;
 import javax.annotation.Nonnull;
 
 import com.google.common.base.StandardSystemProperty;
+import com.microsoft.azure.storage.CloudStorageAccount;
+import com.microsoft.azure.storage.blob.CloudBlobContainer;
+import com.microsoft.azure.storage.blob.CloudBlobDirectory;
 import org.apache.commons.io.FileUtils;
 import org.apache.jackrabbit.core.data.FileDataStore;
 import org.apache.jackrabbit.oak.Oak;
@@ -38,6 +41,7 @@ import org.apache.jackrabbit.oak.segment.SegmentId;
 import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders;
 import org.apache.jackrabbit.oak.segment.SegmentNotFoundException;
 import org.apache.jackrabbit.oak.segment.SegmentNotFoundExceptionListener;
+import org.apache.jackrabbit.oak.segment.azure.AzurePersistence;
 import org.apache.jackrabbit.oak.segment.compaction.SegmentGCOptions;
 import org.apache.jackrabbit.oak.segment.file.FileStore;
 import org.apache.jackrabbit.oak.segment.file.FileStoreBuilder;
@@ -68,6 +72,9 @@ public class SegmentTarFixture extends OakFixture {
         private boolean memoryMapping;
         private boolean useBlobStore;
         private int dsCacheSize;
+        private String azureConnectionString;
+        private String azureContainerName;
+        private String azureRootPath;
         
         public static SegmentTarFixtureBuilder segmentTarFixtureBuilder(String name, File directory) {
             return new SegmentTarFixtureBuilder(name, directory);
@@ -102,6 +109,13 @@ public class SegmentTarFixture extends OakFixture {
             this.dsCacheSize = dsCacheSize;
             return this;
         }
+
+        public SegmentTarFixtureBuilder withAzure(String azureConnectionString, String azureContainerName, String azureRootPath) {
+            this.azureConnectionString = azureConnectionString;
+            this.azureContainerName = azureContainerName;
+            this.azureRootPath = azureRootPath;
+            return this;
+        }
         
         public SegmentTarFixture build() {
             return new SegmentTarFixture(this);
@@ -120,7 +134,11 @@ public class SegmentTarFixture extends OakFixture {
     private final boolean shareBlobStore;
     private final boolean oneShotRun;
     private final boolean secure;
-    
+
+    private final String azureConnectionString;
+    private final String azureContainerName;
+    private final String azureRootPath;
+
     private final File parentPath;
 
     private FileStore[] stores;
@@ -149,6 +167,9 @@ public class SegmentTarFixture extends OakFixture {
         this.memoryMapping = builder.memoryMapping;
         this.useBlobStore = builder.useBlobStore;
         this.dsCacheSize = builder.dsCacheSize;
+        this.azureConnectionString = builder.azureConnectionString;
+        this.azureContainerName = builder.azureContainerName;
+        this.azureRootPath = builder.azureRootPath;
 
         this.withColdStandby = withColdStandby;
         this.syncInterval = syncInterval;
@@ -163,7 +184,14 @@ public class SegmentTarFixture extends OakFixture {
                 .withMaxFileSize(maxFileSize)
                 .withSegmentCacheSize(segmentCacheSize)
                 .withMemoryMapping(memoryMapping);
-        
+
+        if (azureConnectionString != null) {
+            CloudStorageAccount cloud = CloudStorageAccount.parse(azureConnectionString);
+            CloudBlobContainer container = cloud.createCloudBlobClient().getContainerReference(azureContainerName);
+            container.createIfNotExists();
+            CloudBlobDirectory directory = container.getDirectoryReference(azureRootPath);
+            fileStoreBuilder.withCustomPersistence(new AzurePersistence(directory));
+        }
         
         if (useBlobStore) {
             FileDataStore fds = new FileDataStore();
@@ -192,6 +220,15 @@ public class SegmentTarFixture extends OakFixture {
             }
 
             FileStoreBuilder builder = fileStoreBuilder(new File(parentPath, "primary-" + i));
+
+            if (azureConnectionString != null) {
+                CloudStorageAccount cloud = CloudStorageAccount.parse(azureConnectionString);
+                CloudBlobContainer container = cloud.createCloudBlobClient().getContainerReference(azureContainerName);
+                container.createIfNotExists();
+                CloudBlobDirectory directory = container.getDirectoryReference(azureRootPath + "/primary-" + i);
+                builder.withCustomPersistence(new AzurePersistence(directory));
+            }
+
             if (blobStore != null) {
                 builder.withBlobStore(blobStore);
             }