diff --git a/integration-tests/bats/1pk5col-ints.bats b/integration-tests/bats/1pk5col-ints.bats
index d05cc43f03..2e7f921a5d 100755
--- a/integration-tests/bats/1pk5col-ints.bats
+++ b/integration-tests/bats/1pk5col-ints.bats
@@ -14,8 +14,6 @@ CREATE TABLE test (
   PRIMARY KEY (pk)
 );
 SQL
-
-skip_nbf_dolt_1
 }
 
 teardown() {
@@ -25,6 +23,7 @@ teardown() {
 
 # Create a single primary key table and do stuff
 @test "1pk5col-ints: create a table with a schema file and examine repo" {
+    skip_nbf_dolt_1
     run dolt ls
     [ "$status" -eq 0 ]
     [[ "${lines[1]}" =~ "test" ]] || false
@@ -73,6 +72,7 @@ teardown() {
 }
 
 @test "1pk5col-ints: add a row to a created table using dolt table put-row" {
+    skip_nbf_dolt_1
     dolt add test
     dolt commit -m "create table"
     run dolt sql -q "insert into test values (0, 1, 2, 3, 4, 5)"
@@ -390,6 +390,7 @@ teardown() {
 }
 
 @test "1pk5col-ints: generate a merge conflict and resolve with ours" {
+    skip_nbf_dolt_1
     dolt add test
     dolt commit -m "added test table"
     dolt branch test-branch
@@ -434,6 +435,7 @@ teardown() {
 }
 
 @test "1pk5col-ints: generate a merge conflict and try to roll back using dolt merge --abort" {
+    skip_nbf_dolt_1
     dolt add test
     dolt commit -m "added test table"
     dolt branch test-branch
@@ -465,6 +467,7 @@ teardown() {
 }
 
 @test "1pk5col-ints: generate a merge conflict and resolve with theirs" {
+    skip_nbf_dolt_1
     dolt add test
     dolt commit -m "added test table"
     dolt branch test-branch
@@ -658,6 +661,7 @@ DELIM
 }
 
 @test "1pk5col-ints: display correct merge stats" {
+    skip_nbf_dolt_1
     dolt checkout -b test-branch
     dolt add test
     dolt commit -m "added test table"
diff --git a/integration-tests/bats/2pk5cols-ints.bats b/integration-tests/bats/2pk5cols-ints.bats
index deed2efcd8..b0130adde1 100755
--- a/integration-tests/bats/2pk5cols-ints.bats
+++ b/integration-tests/bats/2pk5cols-ints.bats
@@ -23,6 +23,7 @@ teardown() {
 }
 
 @test "2pk5cols-ints: create a table with a schema file and examine repo" {
+    skip_nbf_dolt_1
     run dolt ls
     [ "$status" -eq 0 ]
     [[ "${lines[1]}" =~ "test" ]] || false
@@ -40,6 +41,7 @@ teardown() {
 }
 
 @test "2pk5cols-ints: add a row to a two primary table using dolt table put-row" {
+    skip_nbf_dolt_1
     dolt add test
     dolt commit -m "added test table"
     run dolt sql -q "insert into test values (0, 0, 1, 2, 3, 4, 5)"
diff --git a/integration-tests/bats/auto_increment.bats b/integration-tests/bats/auto_increment.bats
index 323d2c11b4..1bc85e4b79 100644
--- a/integration-tests/bats/auto_increment.bats
+++ b/integration-tests/bats/auto_increment.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
 
     dolt sql <<SQL
 CREATE TABLE test (
diff --git a/integration-tests/bats/blame-system-view.bats b/integration-tests/bats/blame-system-view.bats
index 25eebe418a..2da05ed4e8 100644
--- a/integration-tests/bats/blame-system-view.bats
+++ b/integration-tests/bats/blame-system-view.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
     setup_repository
 }
 
diff --git a/integration-tests/bats/blame.bats b/integration-tests/bats/blame.bats
index ec1b2b79a8..518b2c6e4e 100644
--- a/integration-tests/bats/blame.bats
+++ b/integration-tests/bats/blame.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
     setup_repository
 }
 
diff --git a/integration-tests/bats/branch.bats b/integration-tests/bats/branch.bats
index 05571131a9..fb5ad75882 100644
--- a/integration-tests/bats/branch.bats
+++ b/integration-tests/bats/branch.bats
@@ -11,6 +11,7 @@ teardown() {
 }
 
 @test "branch: deleting a branch deletes its working set" {
+    skip_nbf_dolt_1
     dolt checkout -b to_delete
 
     root=$(noms root .dolt/noms)
diff --git a/integration-tests/bats/case-sensitivity.bats b/integration-tests/bats/case-sensitivity.bats
index 82ba28f7cd..ee28c386a4 100644
--- a/integration-tests/bats/case-sensitivity.bats
+++ b/integration-tests/bats/case-sensitivity.bats
@@ -27,6 +27,7 @@ teardown() {
 }
 
 @test "case-sensitivity: dolt system tables & db names" {
+    skip_nbf_dolt_1
     dolt add -A
     dolt commit -m "random commit"
     dolt sql -q "INSERT INTO test VALUES (3, 'ccc', 'CCC')"
diff --git a/integration-tests/bats/column_tags.bats b/integration-tests/bats/column_tags.bats
index 2a55b19957..997674c18a 100644
--- a/integration-tests/bats/column_tags.bats
+++ b/integration-tests/bats/column_tags.bats
@@ -11,6 +11,7 @@ teardown() {
 }
 
 @test "column_tags: Renaming a column should preserve the tag number" {
+    skip_nbf_dolt_1
     dolt sql <<SQL
 CREATE TABLE test (
   pk BIGINT NOT NULL,
@@ -59,6 +60,7 @@ SQL
 
 
 @test "column_tags: Merging two branches that added same tag, name, type, and constraints" {
+    skip_nbf_dolt_1
     dolt sql <<SQL
 CREATE TABLE test (
   pk BIGINT NOT NULL,
diff --git a/integration-tests/bats/commit_tags.bats b/integration-tests/bats/commit_tags.bats
index 6a3a0367d2..b701821bfd 100644
--- a/integration-tests/bats/commit_tags.bats
+++ b/integration-tests/bats/commit_tags.bats
@@ -78,6 +78,7 @@ teardown() {
 }
 
 @test "commit_tags: use a tag as ref for diff" {
+    skip_nbf_dolt_1
     dolt tag v1 HEAD^
     run dolt diff v1
     [ $status -eq 0 ]
diff --git a/integration-tests/bats/conflict-cat.bats b/integration-tests/bats/conflict-cat.bats
index d8082927c0..bcd50b6a38 100644
--- a/integration-tests/bats/conflict-cat.bats
+++ b/integration-tests/bats/conflict-cat.bats
@@ -10,6 +10,7 @@ teardown() {
 }
 
 @test "conflict-cat: conflicts should show using the union-schema (new schema on right)" {
+    skip_nbf_dolt_1
     dolt sql -q "CREATE TABLE t (a INT PRIMARY KEY, b INT);"
     dolt commit -am "base"
 
@@ -33,6 +34,7 @@ SQL
 }
 
 @test "conflict-cat: conflicts should show using the union-schema (new schema on left)" {
+    skip_nbf_dolt_1
     dolt sql -q "CREATE TABLE t (a INT PRIMARY KEY, b INT);"
     dolt commit -am "base"
 
diff --git a/integration-tests/bats/conflict-detection-2.bats b/integration-tests/bats/conflict-detection-2.bats
index 77c8e4d9be..dd3fc85e9a 100644
--- a/integration-tests/bats/conflict-detection-2.bats
+++ b/integration-tests/bats/conflict-detection-2.bats
@@ -382,6 +382,7 @@ SQL
 }
 
 @test "conflict-detection-2: two branches, one deletes rows, one modifies those same rows. merge. conflict" {
+    skip_nbf_dolt_1
     dolt sql <<SQL
 CREATE TABLE foo (
   pk INT PRIMARY KEY,
@@ -470,6 +471,7 @@ SQL
 }
 
 @test "conflict-detection-2: dolt_force_transaction_commit along with dolt_allow_commit_conflicts ignores conflicts" {
+    skip_nbf_dolt_1
     dolt sql <<"SQL"
 CREATE TABLE test (pk BIGINT PRIMARY KEY, v1 BIGINT);
 INSERT INTO test VALUES (1, 1), (2, 2);
@@ -500,6 +502,7 @@ SQL
 }
 
 @test "conflict-detection-2: conflicts table properly cleared on dolt conflicts resolve" {
+    skip_nbf_dolt_1
     dolt sql -q "create table test(pk int, c1 int, primary key(pk))"
 
     run dolt conflicts cat test
diff --git a/integration-tests/bats/conflict-detection.bats b/integration-tests/bats/conflict-detection.bats
index b9c49edc91..ae2d8c8799 100644
--- a/integration-tests/bats/conflict-detection.bats
+++ b/integration-tests/bats/conflict-detection.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
 }
 
 teardown() {
diff --git a/integration-tests/bats/constraint-violations.bats b/integration-tests/bats/constraint-violations.bats
index 9ae959554c..52bbcca17a 100644
--- a/integration-tests/bats/constraint-violations.bats
+++ b/integration-tests/bats/constraint-violations.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
 }
 
 teardown() {
diff --git a/integration-tests/bats/default-values.bats b/integration-tests/bats/default-values.bats
index 78fed6b536..4621bdbb9a 100644
--- a/integration-tests/bats/default-values.bats
+++ b/integration-tests/bats/default-values.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
 
     dolt sql <<SQL
 CREATE TABLE parent (
diff --git a/integration-tests/bats/diff.bats b/integration-tests/bats/diff.bats
index 3bb99ef2cb..e837f5ea62 100644
--- a/integration-tests/bats/diff.bats
+++ b/integration-tests/bats/diff.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
 
     dolt sql <<SQL
 CREATE TABLE test (
diff --git a/integration-tests/bats/docs.bats b/integration-tests/bats/docs.bats
index 6c96a36dd9..1f4a49d956 100644
--- a/integration-tests/bats/docs.bats
+++ b/integration-tests/bats/docs.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
 }
 
 teardown() {
diff --git a/integration-tests/bats/drop-create.bats b/integration-tests/bats/drop-create.bats
index e7f16ca761..d180bbf048 100755
--- a/integration-tests/bats/drop-create.bats
+++ b/integration-tests/bats/drop-create.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
 }
 
 teardown() {
diff --git a/integration-tests/bats/export-tables.bats b/integration-tests/bats/export-tables.bats
index c77ec05839..d7ecdf2b2c 100644
--- a/integration-tests/bats/export-tables.bats
+++ b/integration-tests/bats/export-tables.bats
@@ -3,6 +3,8 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
+
     dolt sql <<SQL
 CREATE TABLE test_int (
   pk BIGINT NOT NULL,
diff --git a/integration-tests/bats/filter-branch.bats b/integration-tests/bats/filter-branch.bats
index bf8d8cb3a5..d5b2d71f2e 100644
--- a/integration-tests/bats/filter-branch.bats
+++ b/integration-tests/bats/filter-branch.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
 
     dolt sql <<SQL
 CREATE TABLE test (
diff --git a/integration-tests/bats/foreign-keys-invert-pk.bats b/integration-tests/bats/foreign-keys-invert-pk.bats
index ff91c7d97a..cdc844edb2 100644
--- a/integration-tests/bats/foreign-keys-invert-pk.bats
+++ b/integration-tests/bats/foreign-keys-invert-pk.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
 
     dolt sql <<SQL
 create table a (x int, y int, primary key (y,x));
diff --git a/integration-tests/bats/foreign-keys.bats b/integration-tests/bats/foreign-keys.bats
index e1a010f44e..89aa2f5539 100644
--- a/integration-tests/bats/foreign-keys.bats
+++ b/integration-tests/bats/foreign-keys.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
 
     dolt sql <<SQL
 CREATE TABLE parent (
diff --git a/integration-tests/bats/garbage_collection.bats b/integration-tests/bats/garbage_collection.bats
index 540542df60..ed48d0836d 100644
--- a/integration-tests/bats/garbage_collection.bats
+++ b/integration-tests/bats/garbage_collection.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 remotesrv_pid=
 setup() {
+    skip_nbf_dolt_1
     skiponwindows "tests are flaky on Windows"
     setup_common
     cd $BATS_TMPDIR
diff --git a/integration-tests/bats/git-dolt.bats b/integration-tests/bats/git-dolt.bats
index bb03519283..d6a81b95b7 100755
--- a/integration-tests/bats/git-dolt.bats
+++ b/integration-tests/bats/git-dolt.bats
@@ -5,6 +5,7 @@ REMOTE=http://localhost:50051/test-org/test-repo
 
 remotesrv_pid=
 setup() {
+    skip_nbf_dolt_1
     skiponwindows "tests are flaky on Windows"
     setup_common
     cd $BATS_TMPDIR
diff --git a/integration-tests/bats/import-create-tables.bats b/integration-tests/bats/import-create-tables.bats
index 43b484f601..ca7cf006f7 100755
--- a/integration-tests/bats/import-create-tables.bats
+++ b/integration-tests/bats/import-create-tables.bats
@@ -118,6 +118,7 @@ teardown() {
 }
 
 @test "import-create-tables: use -f to overwrite data in existing table" {
+    skip_nbf_dolt_1
     cat <<DELIM > other.csv
 pk,c1,c2,c3,c4,c5
 8,1,2,3,4,5
@@ -392,6 +393,7 @@ DELIM
 }
 
 @test "import-create-tables: dolt diff on a newly created table" {
+    skip_nbf_dolt_1
     dolt sql <<SQL
 CREATE TABLE test (
   pk BIGINT NOT NULL,
@@ -556,6 +558,7 @@ DELIM
 }
 
 @test "import-create-tables: table import -c collects garbage" {
+    skip_nbf_dolt_1
     echo "pk" > pk.csv
     seq 0 100000 >> pk.csv
 
diff --git a/integration-tests/bats/import-mysqldump.bats b/integration-tests/bats/import-mysqldump.bats
index 25122c0a4c..74ef34ae85 100644
--- a/integration-tests/bats/import-mysqldump.bats
+++ b/integration-tests/bats/import-mysqldump.bats
@@ -117,6 +117,7 @@ SQL
 }
 
 @test "import-mysqldump: a table with all types with DEFAULT NULL dump" {
+    skip_nbf_dolt_1
     run dolt sql <<SQL
 CREATE TABLE all_types (
   pk int NOT NULL,
@@ -167,6 +168,7 @@ SQL
 }
 
 @test "import-mysqldump: a table with all types with DEFAULT not-null VALUE dump" {
+    skip_nbf_dolt_1
     run dolt sql <<SQL
 CREATE TABLE types_default (
   pk int NOT NULL,
diff --git a/integration-tests/bats/index.bats b/integration-tests/bats/index.bats
index 2243b36aa0..62dbeb875b 100644
--- a/integration-tests/bats/index.bats
+++ b/integration-tests/bats/index.bats
@@ -3,6 +3,8 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
+
     dolt sql <<SQL
 CREATE TABLE onepk (
   pk1 BIGINT PRIMARY KEY,
diff --git a/integration-tests/bats/json.bats b/integration-tests/bats/json.bats
index e58cc2cb40..5f51208cf4 100644
--- a/integration-tests/bats/json.bats
+++ b/integration-tests/bats/json.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
 }
 
 teardown() {
diff --git a/integration-tests/bats/keyless-foreign-keys.bats b/integration-tests/bats/keyless-foreign-keys.bats
index 60c656bd07..0ab57ba31d 100644
--- a/integration-tests/bats/keyless-foreign-keys.bats
+++ b/integration-tests/bats/keyless-foreign-keys.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
 
     dolt sql <<SQL
 CREATE TABLE parent (
diff --git a/integration-tests/bats/keyless.bats b/integration-tests/bats/keyless.bats
index 12dccd69ac..6f9274b348 100644
--- a/integration-tests/bats/keyless.bats
+++ b/integration-tests/bats/keyless.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
 
     dolt sql <<SQL
 CREATE TABLE keyless (
diff --git a/integration-tests/bats/merge.bats b/integration-tests/bats/merge.bats
index 6a5243eb28..5eab253578 100644
--- a/integration-tests/bats/merge.bats
+++ b/integration-tests/bats/merge.bats
@@ -65,6 +65,7 @@ teardown() {
 }
 
 @test "merge: --abort restores working changes" {
+    skip_nbf_dolt_1
     dolt branch other
 
     dolt sql -q "INSERT INTO test1 VALUES (0,10,10),(1,11,11);"
@@ -170,6 +171,7 @@ teardown() {
 }
 
 @test "merge: dolt commit fails on table with conflict" {
+    skip_nbf_dolt_1
     dolt checkout -b merge_branch
     dolt SQL -q "INSERT INTO test1 values (0,1,1)"
     dolt add test1
@@ -193,6 +195,7 @@ teardown() {
 }
 
 @test "merge: dolt commit fails with unmerged tables in working set" {
+    skip_nbf_dolt_1
     dolt checkout -b merge_branch
     dolt SQL -q "INSERT INTO test1 values (0,1,1)"
     dolt add test1
@@ -319,6 +322,7 @@ teardown() {
 }
 
 @test "merge: Add tables with same schema on two branches, merge" {
+    skip_nbf_dolt_1
     dolt branch other
     dolt sql <<SQL
 CREATE TABLE quiz (pk int PRIMARY KEY);
@@ -347,6 +351,7 @@ SQL
 }
 
 @test "merge: Add views on two branches, merge" {
+    skip_nbf_dolt_1
     dolt branch other
     dolt sql -q "CREATE VIEW pkpk AS SELECT pk*pk FROM test1;"
     dolt add . && dolt commit -m "added view on table test1"
diff --git a/integration-tests/bats/primary-key-changes.bats b/integration-tests/bats/primary-key-changes.bats
index cab764c1b3..73819e45ce 100644
--- a/integration-tests/bats/primary-key-changes.bats
+++ b/integration-tests/bats/primary-key-changes.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
 }
 
 teardown() {
diff --git a/integration-tests/bats/query-catalog.bats b/integration-tests/bats/query-catalog.bats
index 598cfe13c1..7bc625da41 100644
--- a/integration-tests/bats/query-catalog.bats
+++ b/integration-tests/bats/query-catalog.bats
@@ -3,6 +3,8 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
+
     dolt sql <<SQL
 CREATE TABLE one_pk (
   pk BIGINT NOT NULL,
diff --git a/integration-tests/bats/regression-tests.bats b/integration-tests/bats/regression-tests.bats
index 4b434252e3..f63497c797 100644
--- a/integration-tests/bats/regression-tests.bats
+++ b/integration-tests/bats/regression-tests.bats
@@ -98,6 +98,7 @@ SQL
 }
 
 @test "regression-tests: UNIQUE index violations do not break future INSERTs" {
+    skip_nbf_dolt_1
     skiponwindows "Need to install expect and make this script work on windows."
     mkdir doltsql
     cd doltsql
@@ -121,6 +122,7 @@ SQL
 }
 
 @test "regression-tests: BLOB primary key causing panic from nil VRW" {
+    skip_nbf_dolt_1
     # caught by fuzzer
     dolt sql <<"SQL"
 CREATE TABLE `xtqKEPCJmU` (`icguU2` BLOB, PRIMARY KEY (`icguU2`));
diff --git a/integration-tests/bats/remotes.bats b/integration-tests/bats/remotes.bats
index 5d7557f23e..2707be82d7 100644
--- a/integration-tests/bats/remotes.bats
+++ b/integration-tests/bats/remotes.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 remotesrv_pid=
 setup() {
+    skip_nbf_dolt_1
     skiponwindows "tests are flaky on Windows"
     setup_common
     cd $BATS_TMPDIR
diff --git a/integration-tests/bats/rename-tables.bats b/integration-tests/bats/rename-tables.bats
index ce7173dbdb..090f6554fa 100644
--- a/integration-tests/bats/rename-tables.bats
+++ b/integration-tests/bats/rename-tables.bats
@@ -31,6 +31,7 @@ teardown() {
 # see 'cp-and-mv.bats' for renaming a table with `dolt mv`
 
 @test "rename-tables: diff a renamed table" {
+    skip_nbf_dolt_1
     dolt sql <<SQL
 CREATE TABLE test (pk int PRIMARY KEY);
 SQL
@@ -46,6 +47,7 @@ SQL
 }
 
 @test "rename-tables: sql diff a renamed table" {
+    skip_nbf_dolt_1
     dolt sql <<SQL
 CREATE TABLE test (pk int PRIMARY KEY);
 SQL
diff --git a/integration-tests/bats/replace.bats b/integration-tests/bats/replace.bats
index d6780e15b6..85da8db576 100644
--- a/integration-tests/bats/replace.bats
+++ b/integration-tests/bats/replace.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
 
     dolt sql -q "create table t1 (a bigint primary key, b bigint)"
     dolt sql -q "insert into t1 values (0,0), (1,1)"
diff --git a/integration-tests/bats/revert.bats b/integration-tests/bats/revert.bats
index e7c7eedef4..3a0139eccd 100644
--- a/integration-tests/bats/revert.bats
+++ b/integration-tests/bats/revert.bats
@@ -71,6 +71,7 @@ teardown() {
 }
 
 @test "revert: constraint violations" {
+    skip_nbf_dolt_1
     dolt sql <<"SQL"
 CREATE TABLE parent (pk BIGINT PRIMARY KEY, v1 BIGINT, INDEX(v1));
 CREATE TABLE child (pk BIGINT PRIMARY KEY, v1 BIGINT, CONSTRAINT fk_name FOREIGN KEY (v1) REFERENCES parent (v1));
@@ -242,6 +243,7 @@ SQL
 }
 
 @test "revert: SQL constraint violations" {
+    skip_nbf_dolt_1
     dolt sql <<"SQL"
 CREATE TABLE parent (pk BIGINT PRIMARY KEY, v1 BIGINT, INDEX(v1));
 CREATE TABLE child (pk BIGINT PRIMARY KEY, v1 BIGINT, CONSTRAINT fk_name FOREIGN KEY (v1) REFERENCES parent (v1));
@@ -262,6 +264,7 @@ SQL
 }
 
 @test "revert: Stored Procedure constraint violations" {
+    skip_nbf_dolt_1
     dolt sql <<"SQL"
 CREATE TABLE parent (pk BIGINT PRIMARY KEY, v1 BIGINT, INDEX(v1));
 CREATE TABLE child (pk BIGINT PRIMARY KEY, v1 BIGINT, CONSTRAINT fk_name FOREIGN KEY (v1) REFERENCES parent (v1));
diff --git a/integration-tests/bats/schema-changes.bats b/integration-tests/bats/schema-changes.bats
index bf506ba0fc..3a79998691 100755
--- a/integration-tests/bats/schema-changes.bats
+++ b/integration-tests/bats/schema-changes.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
 
     dolt sql <<SQL
 CREATE TABLE test (
diff --git a/integration-tests/bats/schema-export.bats b/integration-tests/bats/schema-export.bats
index b4556bf585..722741530e 100755
--- a/integration-tests/bats/schema-export.bats
+++ b/integration-tests/bats/schema-export.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
 
     dolt sql <<SQL
 CREATE TABLE test1 (
diff --git a/integration-tests/bats/sql-checkout.bats b/integration-tests/bats/sql-checkout.bats
index 0fc2e8cdcf..26528a3a96 100644
--- a/integration-tests/bats/sql-checkout.bats
+++ b/integration-tests/bats/sql-checkout.bats
@@ -287,6 +287,7 @@ SQL
 }
 
 @test "sql-checkout: DOLT_CHECKOUT works with dolt_diff tables" {
+    skip_nbf_dolt_1
     dolt add . && dolt commit -m "1, 2, and 3 in test table"
 
     run dolt sql -q "SELECT * FROM dolt_diff_test";
@@ -330,6 +331,7 @@ SQL
 }
 
 @test "sql-checkout: CALL DOLT_CHECKOUT works with dolt_diff tables" {
+    skip_nbf_dolt_1
     dolt add . && dolt commit -m "1, 2, and 3 in test table"
 
     run dolt sql -q "SELECT * FROM dolt_diff_test";
diff --git a/integration-tests/bats/sql-commit.bats b/integration-tests/bats/sql-commit.bats
index 999d7b362c..d52656e0c6 100644
--- a/integration-tests/bats/sql-commit.bats
+++ b/integration-tests/bats/sql-commit.bats
@@ -187,6 +187,7 @@ SQL
 }
 
 @test "sql-commit: DOLT_COMMIT immediately updates dolt diff system table." {
+    skip_nbf_dolt_1
     original_hash=$(get_head_commit)
     run dolt sql << SQL
 SELECT DOLT_COMMIT('-a', '-m', 'Commit1');
@@ -199,6 +200,7 @@ SQL
 }
 
 @test "sql-commit: CALL DOLT_COMMIT immediately updates dolt diff system table." {
+    skip_nbf_dolt_1
     original_hash=$(get_head_commit)
     run dolt sql << SQL
 CALL DOLT_COMMIT('-a', '-m', 'Commit1');
@@ -251,6 +253,7 @@ SQL
 }
 
 @test "sql-commit: DOLT_COMMIT with unstaged tables leaves them in the working set" {
+    skip_nbf_dolt_1
     head_variable=@@dolt_repo_$$_head
 
     run dolt sql << SQL
@@ -310,6 +313,7 @@ SQL
 }
 
 @test "sql-commit: CALL DOLT_COMMIT with unstaged tables leaves them in the working set" {
+    skip_nbf_dolt_1
     head_variable=@@dolt_repo_$$_head
 
     run dolt sql << SQL
diff --git a/integration-tests/bats/sql-conflicts.bats b/integration-tests/bats/sql-conflicts.bats
index ea17abec8c..2fb22bc242 100644
--- a/integration-tests/bats/sql-conflicts.bats
+++ b/integration-tests/bats/sql-conflicts.bats
@@ -35,6 +35,7 @@ teardown() {
 }
 
 @test "sql-conflicts: add conflict" {
+  skip_nbf_dolt_1
   dolt branch feature_branch main
   dolt SQL -q "INSERT INTO one_pk (pk1,c1,c2) VALUES (0,0,0)"
   dolt SQL -q "INSERT INTO two_pk (pk1,pk2,c1,c2) VALUES (0,0,0,0)"
@@ -94,6 +95,7 @@ SQL
 
 
 @test "sql-conflicts: modify conflict" {
+  skip_nbf_dolt_1
   dolt SQL -q "INSERT INTO one_pk (pk1,c1,c2) VALUES (0,0,0)"
   dolt SQL -q "INSERT INTO two_pk (pk1,pk2,c1,c2) VALUES (0,0,0,0)"
   dolt add .
@@ -152,6 +154,7 @@ SQL
 }
 
 @test "sql-conflicts: delete modify conflict" {
+  skip_nbf_dolt_1
   dolt SQL -q "INSERT INTO one_pk (pk1,c1,c2) VALUES (0,0,0)"
   dolt SQL -q "INSERT INTO two_pk (pk1,pk2,c1,c2) VALUES (0,0,0,0)"
   dolt add .
@@ -210,6 +213,7 @@ SQL
 }
 
 @test "sql-conflicts: multiple conflicts" {
+  skip_nbf_dolt_1
   dolt SQL -q "INSERT INTO one_pk (pk1,c1,c2) VALUES (0,0,0)"
   dolt SQL -q "INSERT INTO one_pk (pk1,c1,c2) VALUES (1,0,0)"
   dolt SQL -q "INSERT INTO one_pk (pk1,c1,c2) VALUES (2,0,0)"
diff --git a/integration-tests/bats/sql-create-tables.bats b/integration-tests/bats/sql-create-tables.bats
index 1a55337010..9e0aa65b2c 100644
--- a/integration-tests/bats/sql-create-tables.bats
+++ b/integration-tests/bats/sql-create-tables.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
 }
 
 teardown() {
diff --git a/integration-tests/bats/sql-diff.bats b/integration-tests/bats/sql-diff.bats
index 97848d40b1..d2c293021d 100644
--- a/integration-tests/bats/sql-diff.bats
+++ b/integration-tests/bats/sql-diff.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
 }
 
 teardown() {
diff --git a/integration-tests/bats/sql-fetch.bats b/integration-tests/bats/sql-fetch.bats
index 133e6bd089..ec6d8562eb 100644
--- a/integration-tests/bats/sql-fetch.bats
+++ b/integration-tests/bats/sql-fetch.bats
@@ -2,6 +2,7 @@
 load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
+    skip_nbf_dolt_1
     setup_common
     TMPDIRS=$(pwd)/tmpdirs
     mkdir -p $TMPDIRS/{rem1,repo1}
diff --git a/integration-tests/bats/sql-merge.bats b/integration-tests/bats/sql-merge.bats
index f88788cabc..2ecd776141 100644
--- a/integration-tests/bats/sql-merge.bats
+++ b/integration-tests/bats/sql-merge.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
 
     dolt sql <<SQL
 CREATE TABLE test (
diff --git a/integration-tests/bats/sql-reset.bats b/integration-tests/bats/sql-reset.bats
index 34ee2e715c..d3c870665d 100644
--- a/integration-tests/bats/sql-reset.bats
+++ b/integration-tests/bats/sql-reset.bats
@@ -3,6 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
     setup_common
+    skip_nbf_dolt_1
 
     dolt sql <<SQL
 CREATE TABLE test (
diff --git a/integration-tests/bats/sql-server.bats b/integration-tests/bats/sql-server.bats
index 28bdacb5a8..4590975c1d 100644
--- a/integration-tests/bats/sql-server.bats
+++ b/integration-tests/bats/sql-server.bats
@@ -601,6 +601,7 @@ SQL
 }
 
 @test "sql-server: JSON queries" {
+    skip_nbf_dolt_1
     cd repo1
     start_sql_server repo1
 
@@ -655,6 +656,7 @@ SQL
 
 # TODO: Need to update testing logic allow queries for a multiple session.
 @test "sql-server: Create a temporary table and validate that it doesn't persist after a session closes" {
+    skip_nbf_dolt_1
     skiponwindows "Has dependencies that are missing on the Jenkins Windows installation."
 
     cd repo1
diff --git a/integration-tests/bats/sql-shell.bats b/integration-tests/bats/sql-shell.bats
index f201ebff04..220e6c66c7 100644
--- a/integration-tests/bats/sql-shell.bats
+++ b/integration-tests/bats/sql-shell.bats
@@ -57,6 +57,7 @@ teardown() {
 }
 
 @test "sql-shell: validate string formatting" {
+      skip_nbf_dolt_1
       dolt sql <<SQL
 CREATE TABLE test2 (
   str varchar(256) NOT NULL,
diff --git a/integration-tests/bats/sql-spatial-types.bats b/integration-tests/bats/sql-spatial-types.bats
index 216b7bd0f5..5e63ab644b 100644
--- a/integration-tests/bats/sql-spatial-types.bats
+++ b/integration-tests/bats/sql-spatial-types.bats
@@ -75,6 +75,8 @@ teardown() {
 }
 
 @test "sql-spatial-types: create geometry table and insert existing spetial types" {
+    skip_nbf_dolt_1
+
     # create geometry table
     run dolt sql -q "create table geom_tbl (g geometry)"
     [ "$status" -eq 0 ]
@@ -129,6 +131,7 @@ teardown() {
 }
 
 @test "sql-spatial-types: prevent altering table to use point type as primary key" {
+    skip_nbf_dolt_1
     dolt sql -q "create table point_tbl (p int primary key)"
     run dolt sql -q "alter table point_tbl modify column p point primary key"
     [ "$status" -eq 1 ]
@@ -136,6 +139,7 @@ teardown() {
 }
 
 @test "sql-spatial-types: prevent altering table to use linestring type as primary key" {
+    skip_nbf_dolt_1
     dolt sql -q "create table line_tbl (l int primary key)"
     run dolt sql -q "alter table line_tbl modify column l linestring primary key"
     [ "$status" -eq 1 ]
@@ -143,6 +147,7 @@ teardown() {
 }
 
 @test "sql-spatial-types: prevent altering table to use polygon type as primary key" {
+    skip_nbf_dolt_1
     dolt sql -q "create table poly_tbl (p int primary key)"
     run dolt sql -q "alter table poly_tbl modify column p polygon primary key"
     [ "$status" -eq 1 ]
@@ -150,6 +155,7 @@ teardown() {
 }
 
 @test "sql-spatial-types: prevent altering table to use geometry type as primary key" {
+    skip_nbf_dolt_1
     dolt sql -q "create table geom_tbl (g int primary key)"
     run dolt sql -q "alter table geom_tbl modify column g geometry primary key"
     [ "$status" -eq 1 ]
diff --git a/integration-tests/bats/sql-status.bats b/integration-tests/bats/sql-status.bats
index 1b3f4111a2..96942a4e71 100644
--- a/integration-tests/bats/sql-status.bats
+++ b/integration-tests/bats/sql-status.bats
@@ -49,6 +49,7 @@ teardown() {
 }
 
 @test "sql-status: status properly works with staged and not staged doc diffs" {
+    skip_nbf_dolt_1
     echo readme-text > README.md
     echo license-text > LICENSE.md
 
@@ -61,6 +62,7 @@ teardown() {
 }
 
 @test "sql-status: status works property with working tables in conflict" {
+    skip_nbf_dolt_1
     # Start by causing the conflict.
     dolt sql -q "insert into test values (0, 0, 0, 0, 0, 0)"
     dolt add test
@@ -84,6 +86,7 @@ teardown() {
 }
 
 @test "sql-status: status works properly with working docs in conflict" {
+     skip_nbf_dolt_1
      echo "a readme" > README.md
      dolt add .
      dolt commit -m "Committing initial docs"
diff --git a/integration-tests/bats/sql.bats b/integration-tests/bats/sql.bats
index a67762cf1e..eae5b38125 100755
--- a/integration-tests/bats/sql.bats
+++ b/integration-tests/bats/sql.bats
@@ -40,6 +40,7 @@ teardown() {
 }
 
 @test "sql: errors do not write incomplete rows" {
+    skip_nbf_dolt_1
     dolt sql <<"SQL"
 CREATE TABLE test (
     pk BIGINT PRIMARY KEY,
@@ -868,6 +869,7 @@ SQL
 }
 
 @test "sql: alter table to add and delete a column" {
+    skip_nbf_dolt_1
     run dolt sql -q "alter table one_pk add (c6 int)"
     [ $status -eq 0 ]
     run dolt sql -q "describe one_pk"
@@ -885,6 +887,7 @@ SQL
 }
 
 @test "sql: alter table to rename a column" {
+    skip_nbf_dolt_1
     dolt sql -q "alter table one_pk add (c6 int)"
     run dolt sql -q "alter table one_pk rename column c6 to c7"
     [ $status -eq 0 ]
@@ -895,6 +898,7 @@ SQL
 }
 
 @test "sql: alter table change column to rename a column" {
+    skip_nbf_dolt_1
     dolt sql -q "alter table one_pk add (c6 int)"
     dolt sql -q "alter table one_pk change column c6 c7 int"
     run dolt sql -q "describe one_pk"
@@ -983,6 +987,7 @@ SQL
 }
 
 @test "sql: alter table modify column type failure" {
+    skip_nbf_dolt_1
     dolt sql <<SQL
 CREATE TABLE t1(pk BIGINT PRIMARY KEY, v1 INT, INDEX(v1));
 CREATE TABLE t2(pk BIGINT PRIMARY KEY, v1 VARCHAR(20), INDEX(v1));
@@ -1517,6 +1522,7 @@ SQL
 }
 
 @test "sql: dolt diff table correctly works with IN" {
+    skip_nbf_dolt_1
     dolt sql -q "CREATE TABLE mytable(pk int primary key);"
     dolt sql -q "INSERT INTO mytable VALUES (1), (2)"
     dolt commit -am "Commit 1"
diff --git a/integration-tests/bats/status.bats b/integration-tests/bats/status.bats
index 698eaa95c4..fdf13cfdb4 100644
--- a/integration-tests/bats/status.bats
+++ b/integration-tests/bats/status.bats
@@ -94,6 +94,7 @@ SQL
 }
 
 @test "status: tables in conflict" {
+    skip_nbf_dolt_1
     dolt sql <<SQL
 CREATE TABLE t (pk int PRIMARY KEY, c0 int);
 INSERT INTO t VALUES (1,1);
diff --git a/integration-tests/bats/system-tables.bats b/integration-tests/bats/system-tables.bats
index e1c03d8319..21cb668350 100644
--- a/integration-tests/bats/system-tables.bats
+++ b/integration-tests/bats/system-tables.bats
@@ -2,6 +2,7 @@
 load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
+    skip_nbf_dolt_1
     skiponwindows "tests are flaky on Windows"
     setup_common
 
diff --git a/integration-tests/bats/tableplus.bats b/integration-tests/bats/tableplus.bats
index 5b062b2d8b..3a56edbabc 100644
--- a/integration-tests/bats/tableplus.bats
+++ b/integration-tests/bats/tableplus.bats
@@ -5,6 +5,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
   setup_common
+  skip_nbf_dolt_1
 
   mkdir test
   cd test
diff --git a/integration-tests/bats/triggers.bats b/integration-tests/bats/triggers.bats
index 391acc4b74..825a52f203 100644
--- a/integration-tests/bats/triggers.bats
+++ b/integration-tests/bats/triggers.bats
@@ -128,6 +128,7 @@ SQL
 }
 
 @test "triggers: Merge with manual resolution" {
+    skip_nbf_dolt_1
     dolt sql <<SQL
 CREATE TABLE x(a BIGINT PRIMARY KEY);
 CREATE TRIGGER trigger1 BEFORE INSERT ON x FOR EACH ROW SET new.a = new.a + 1;
diff --git a/integration-tests/bats/types.bats b/integration-tests/bats/types.bats
index a1ba58c910..0ad2582a4a 100644
--- a/integration-tests/bats/types.bats
+++ b/integration-tests/bats/types.bats
@@ -243,6 +243,7 @@ SQL
 }
 
 @test "types: DATE" {
+    skip_nbf_dolt_1
     dolt sql <<SQL
 CREATE TABLE test (
   pk BIGINT NOT NULL,
@@ -288,6 +289,7 @@ SQL
 }
 
 @test "types: DATETIME" {
+    skip_nbf_dolt_1
     dolt sql <<SQL
 CREATE TABLE test (
   pk BIGINT NOT NULL,
diff --git a/integration-tests/bats/verify-constraints.bats b/integration-tests/bats/verify-constraints.bats
index ed180de036..849f54014d 100644
--- a/integration-tests/bats/verify-constraints.bats
+++ b/integration-tests/bats/verify-constraints.bats
@@ -2,6 +2,7 @@
 load $BATS_TEST_DIRNAME/helper/common.bash
 
 setup() {
+    skip_nbf_dolt_1
     setup_common
     dolt sql <<"SQL"
 CREATE TABLE parent3 (pk BIGINT PRIMARY KEY, v1 BIGINT, INDEX (v1));
diff --git a/integration-tests/bats/window.bats b/integration-tests/bats/window.bats
index 43ca0cdac7..f7b7795f1d 100644
--- a/integration-tests/bats/window.bats
+++ b/integration-tests/bats/window.bats
@@ -11,6 +11,7 @@ teardown() {
 }
 
 @test "window: no diff table window buffer sharing" {
+    skip_nbf_dolt_1
     dolt sql -q "create table a (x int primary key, y varchar(1))"
     dolt add .
     dolt commit -m table