diff --git a/.github/workflows/release_cli_and_assets.yml b/.github/workflows/release_cli_and_assets.yml
index 38e136dba..b609da1b8 100644
--- a/.github/workflows/release_cli_and_assets.yml
+++ b/.github/workflows/release_cli_and_assets.yml
@@ -335,6 +335,7 @@ jobs:
           - "snapshot"
           - "dashboard"
           - "dashboard_parsing_validation"
+          - "schema_cloning"
           - "exit_codes"
           - "force_stop"
         exclude:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fad5c6ab0..9ae3bcde3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -108,6 +108,7 @@ jobs:
           - "snapshot"
           - "dashboard"
           - "dashboard_parsing_validation"
+          - "schema_cloning"
           - "exit_codes"
           - "force_stop"
         exclude:
diff --git a/tests/acceptance/test_files/schema_cloning.bats b/tests/acceptance/test_files/schema_cloning.bats
new file mode 100644
index 000000000..ac1f3b496
--- /dev/null
+++ b/tests/acceptance/test_files/schema_cloning.bats
@@ -0,0 +1,25 @@
+load "$LIB_BATS_ASSERT/load.bash"
+load "$LIB_BATS_SUPPORT/load.bash"
+
+# This test looks for a bug in the schema cloning code meaning when adding multiple connections 
+# for the same plugin, only 1 of the connections will work when querying - the others will give an 
+# FDW no schema loaded for connection error.
+@test "schema cloning" {
+  # remove existing connections
+  rm -f $STEAMPIPE_INSTALL_DIR/config/chaos.spc
+
+  # remove db, to trigger a clean installation with no connections
+  rm -rf $STEAMPIPE_INSTALL_DIR/db
+
+  # run steampipe(installs db)
+  steampipe query "select 1"
+
+  # add connections(more than 1) to trigger schema cloning
+  cp $SRC_DATA_DIR/two_chaos.spc $STEAMPIPE_INSTALL_DIR/config/chaos.spc
+
+  # query both connections(both should work)
+  run steampipe query "select * from chaos.chaos_all_column_types"
+  assert_success
+  run steampipe query "select * from chaos2.chaos_all_column_types"
+  assert_success
+}