diff --git a/stress/main.rs b/stress/main.rs
index 68e7ee0cf..79837c442 100644
--- a/stress/main.rs
+++ b/stress/main.rs
@@ -163,8 +163,8 @@ pub fn gen_bool(probability_true: f64) -> bool {
     (get_random() as f64 / u64::MAX as f64) < probability_true
 }
 
-pub fn gen_schema() -> ArbitrarySchema {
-    let table_count = (get_random() % 10 + 1) as usize;
+pub fn gen_schema(table_count: Option<usize>) -> ArbitrarySchema {
+    let table_count = table_count.unwrap_or((get_random() % 10 + 1) as usize);
     let mut tables = Vec::with_capacity(table_count);
     let mut table_names = HashSet::new();
 
@@ -334,7 +334,7 @@ fn generate_random_statement(schema: &ArbitrarySchema) -> String {
 }
 
 fn generate_plan(opts: &Opts) -> Result<Plan, Box<dyn std::error::Error + Send + Sync>> {
-    let schema = gen_schema();
+    let schema = gen_schema(opts.tables);
     // Write DDL statements to log file
     let mut log_file = File::create(&opts.log_file)?;
     let ddl_statements = schema.to_sql();
diff --git a/stress/opts.rs b/stress/opts.rs
index 82802b2dd..fd53d7635 100644
--- a/stress/opts.rs
+++ b/stress/opts.rs
@@ -62,4 +62,8 @@ pub struct Opts {
         help = "Select VFS. options are io_uring (if feature enabled), memory, and syscall"
     )]
     pub vfs: Option<String>,
+
+    /// Number of tables to use
+    #[clap(long, help = "Select number of tables to create")]
+    pub tables: Option<usize>,
 }