diff --git a/crates-cli/yaak-cli/src/plugin_events.rs b/crates-cli/yaak-cli/src/plugin_events.rs
index 24cad0db..09d59d32 100644
--- a/crates-cli/yaak-cli/src/plugin_events.rs
+++ b/crates-cli/yaak-cli/src/plugin_events.rs
@@ -1037,7 +1037,7 @@ mod environment_tests {
     use tokio::io::{AsyncReadExt, AsyncWriteExt};
     use tokio::net::TcpListener;
     use tokio::time::{Duration, timeout};
-    use yaak_models::models::{EnvironmentVariable, HttpRequest, HttpRequestHeader};
+    use yaak_models::models::{EnvironmentVariable, HttpRequest, HttpRequestHeader, Workspace};
 
     #[tokio::test]
     async fn plugin_send_uses_override_and_fallback_and_rejects_invalid_ids_before_sending() {
@@ -1079,7 +1079,11 @@ mod environment_tests {
         let (base, a, b, request) = query_manager
             .with_tx(|db| {
                 let source = &UpdateSource::Background;
-                let workspace = db.list_workspaces()?.remove(0);
+                // Fresh databases no longer come with a workspace, so make one
+                let workspace = db.upsert_workspace(
+                    &Workspace { name: "Test".into(), ..Default::default() },
+                    source,
+                )?;
                 let vars = |value: &str| {
                     vec![EnvironmentVariable {
                         enabled: true,
diff --git a/crates/yaak-models/src/queries/environments.rs b/crates/yaak-models/src/queries/environments.rs
index 75bea6c1..5fc0402d 100644
--- a/crates/yaak-models/src/queries/environments.rs
+++ b/crates/yaak-models/src/queries/environments.rs
@@ -232,7 +232,11 @@ mod tests {
         let source = &UpdateSource::Background;
         let (base, staging, folder) = manager
             .with_tx(|db| {
-                let workspace = db.list_workspaces()?.remove(0);
+                // Fresh databases no longer come with a workspace, so make one
+                let workspace = db.upsert_workspace(
+                    &Workspace { name: "Test".into(), ..Default::default() },
+                    source,
+                )?;
                 let variable = |name: &str, value: &str| EnvironmentVariable {
                     enabled: true,
                     name: name.into(),