diff --git oak-run/pom.xml oak-run/pom.xml
index 5ebdf97..d747514 100644
--- oak-run/pom.xml
+++ oak-run/pom.xml
@@ -226,6 +226,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>oak-segment</artifactId>
+      <version>1.6.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-aws-ext</artifactId>
       <version>${jackrabbit.version}</version>
       <optional>true</optional>
diff --git oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/CommonOptions.java oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/CommonOptions.java
index 58788a6..e9e3162 100644
--- oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/CommonOptions.java
+++ oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/CommonOptions.java
@@ -35,12 +35,14 @@ public class CommonOptions implements OptionsBean {
     private final OptionSpec<Void> readWriteOption;
     private final OptionSpec<String> nonOption;
     private final OptionSpec<Void> metrics;
+    private final OptionSpec<Void> segment;
     private OptionSet options;
 
     public CommonOptions(OptionParser parser){
         help = parser.acceptsAll(asList("h", "?", "help"), "Show help").forHelp();
         readWriteOption = parser.accepts("read-write", "Connect to repository in read-write mode");
         metrics = parser.accepts("metrics", "Enables metrics based statistics collection");
+        segment = parser.accepts("segment", "Use older oak-segment support");
         nonOption = parser.nonOptions(DEFAULT_CONNECTION_STRING);
     }
 
@@ -69,8 +71,8 @@ public class CommonOptions implements OptionsBean {
         return getStoreArg().startsWith("jdbc");
     }
 
-    public boolean isSegment(){
-        return !isDocument();
+    public boolean isOldSegment(){
+        return options.has(segment);
     }
 
     public boolean isDocument(){
diff --git oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java
index 6f32901..58ebe24 100644
--- oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java
+++ oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java
@@ -79,6 +79,8 @@ public class NodeStoreFixtureProvider {
         NodeStore store;
         if (commonOpts.isMongo() || commonOpts.isRDB()) {
             store = configureDocumentMk(options, blobStore, statisticsProvider, closer, wb, readOnly);
+        } else if (commonOpts.isOldSegment()) {
+            store = SegmentFixtureProvider.create(options, blobStore, statisticsProvider, closer, readOnly);
         } else {
             store = configureSegment(options, blobStore, statisticsProvider, closer, readOnly);
         }
diff --git oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentFixtureProvider.java oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentFixtureProvider.java
new file mode 100644
index 0000000..08d6fd8
--- /dev/null
+++ oak-run/src/main/java/org/apache/jackrabbit/oak/run/cli/SegmentFixtureProvider.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.jackrabbit.oak.run.cli;
+
+import java.io.File;
+import java.io.IOException;
+
+import com.google.common.io.Closer;
+import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
+import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
+import org.apache.jackrabbit.oak.plugins.segment.file.InvalidFileStoreVersionException;
+import org.apache.jackrabbit.oak.spi.blob.BlobStore;
+import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.apache.jackrabbit.oak.stats.StatisticsProvider;
+
+class SegmentFixtureProvider {
+
+    static NodeStore create(Options options, BlobStore blobStore, StatisticsProvider statisticsProvider, Closer closer, boolean readOnly)
+            throws IOException, InvalidFileStoreVersionException {
+
+        String path = options.getOptionBean(CommonOptions.class).getStoreArg();
+        FileStore.Builder builder = FileStore.builder(new File(path))
+                .withMaxFileSize(256).withDefaultMemoryMapping();
+
+        if (blobStore != null) {
+            builder.withBlobStore(blobStore);
+        }
+
+        NodeStore nodeStore;
+        if (readOnly) {
+            FileStore.ReadOnlyStore fileStore = builder
+                    .withStatisticsProvider(statisticsProvider)
+                    .buildReadOnly();
+            closer.register(fileStore);
+            nodeStore = SegmentNodeStore.builder(fileStore).build();
+        } else {
+            FileStore fileStore = builder
+                    .withStatisticsProvider(statisticsProvider)
+                    .build();
+            closer.register(fileStore);
+            nodeStore = SegmentNodeStore.builder(fileStore).build();
+        }
+
+        return nodeStore;
+    }
+}