diff --git a/CHANGELOG.md b/CHANGELOG.md
index 548b37fa0c..68522bfa08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 
 - Removed "rescript legacy" subcommand in favor of separate "rescript-legacy" binary. https://github.com/rescript-lang/rescript/pull/7928
 - Add comparison fn for Error in Result.equal and compare. https://github.com/rescript-lang/rescript/pull/7933
+- Rewatch: `"type": "dev"` and `dev-dependencies` will be compiled by default for local packages. The `--dev` flag no longer does anything. https://github.com/rescript-lang/rescript/pull/7934
 
 #### :eyeglasses: Spec Compliance
 
diff --git a/rewatch/src/build.rs b/rewatch/src/build.rs
index 00272c7b0f..a06a84b168 100644
--- a/rewatch/src/build.rs
+++ b/rewatch/src/build.rs
@@ -131,7 +131,6 @@ pub fn initialize_build(
     filter: &Option<regex::Regex>,
     show_progress: bool,
     path: &Path,
-    build_dev_deps: bool,
     snapshot_output: bool,
     warn_error: Option<String>,
 ) -> Result<BuildCommandState> {
@@ -144,7 +143,7 @@ pub fn initialize_build(
     }
 
     let timing_package_tree = Instant::now();
-    let packages = packages::make(filter, &project_context, show_progress, build_dev_deps)?;
+    let packages = packages::make(filter, &project_context, show_progress)?;
     let timing_package_tree_elapsed = timing_package_tree.elapsed();
 
     let compiler_check = verify_compiler_info(&packages, &compiler);
@@ -540,7 +539,6 @@ pub fn build(
     show_progress: bool,
     no_timing: bool,
     create_sourcedirs: bool,
-    build_dev_deps: bool,
     snapshot_output: bool,
     warn_error: Option<String>,
 ) -> Result<BuildCommandState> {
@@ -555,7 +553,6 @@ pub fn build(
         filter,
         show_progress,
         path,
-        build_dev_deps,
         snapshot_output,
         warn_error,
     )
diff --git a/rewatch/src/build/clean.rs b/rewatch/src/build/clean.rs
index 17b7c4ef51..7a360f7f64 100644
--- a/rewatch/src/build/clean.rs
+++ b/rewatch/src/build/clean.rs
@@ -331,10 +331,10 @@ pub fn cleanup_after_build(build_state: &BuildCommandState) {
     });
 }
 
-pub fn clean(path: &Path, show_progress: bool, snapshot_output: bool, clean_dev_deps: bool) -> Result<()> {
+pub fn clean(path: &Path, show_progress: bool, snapshot_output: bool) -> Result<()> {
     let project_context = ProjectContext::new(path)?;
     let compiler_info = build::get_compiler_info(&project_context)?;
-    let packages = packages::make(&None, &project_context, show_progress, clean_dev_deps)?;
+    let packages = packages::make(&None, &project_context, show_progress)?;
 
     let timing_clean_compiler_assets = Instant::now();
     if !snapshot_output && show_progress {
diff --git a/rewatch/src/build/packages.rs b/rewatch/src/build/packages.rs
index cc0436650d..fcb4856e71 100644
--- a/rewatch/src/build/packages.rs
+++ b/rewatch/src/build/packages.rs
@@ -288,12 +288,12 @@ fn read_dependencies(
     project_context: &ProjectContext,
     package_config: &Config,
     show_progress: bool,
-    build_dev_deps: bool,
+    is_local_dep: bool,
 ) -> Vec<Dependency> {
     let mut dependencies = package_config.dependencies.to_owned().unwrap_or_default();
 
-    // Concatenate dev dependencies if build_dev_deps is true
-    if build_dev_deps && let Some(dev_deps) = package_config.dev_dependencies.to_owned() {
+    // Concatenate dev dependencies if is_local_dep is true
+    if is_local_dep && let Some(dev_deps) = package_config.dev_dependencies.to_owned() {
         dependencies.extend(dev_deps);
     }
 
@@ -367,7 +367,7 @@ fn read_dependencies(
                 project_context,
                 &config,
                 show_progress,
-                is_local_dep && build_dev_deps,
+                is_local_dep,
             );
 
             Dependency {
@@ -477,11 +477,7 @@ This inconsistency will cause issues with package resolution.\n",
     }
 }
 
-fn read_packages(
-    project_context: &ProjectContext,
-    show_progress: bool,
-    build_dev_deps: bool,
-) -> Result<AHashMap<String, Package>> {
+fn read_packages(project_context: &ProjectContext, show_progress: bool) -> Result<AHashMap<String, Package>> {
     // Store all packages and completely deduplicate them
     let mut map: AHashMap<String, Package> = AHashMap::new();
     let current_package = {
@@ -501,7 +497,7 @@ fn read_packages(
         project_context,
         &project_context.current_config,
         show_progress,
-        build_dev_deps,
+        /* is local dep */ true,
     ));
     dependencies.iter().for_each(|d| {
         if !map.contains_key(&d.name) {
@@ -564,7 +560,6 @@ pub fn get_source_files(
 fn extend_with_children(
     filter: &Option<regex::Regex>,
     mut build: AHashMap<String, Package>,
-    build_dev_deps: bool,
 ) -> AHashMap<String, Package> {
     for (_key, package) in build.iter_mut() {
         let mut map: AHashMap<PathBuf, SourceFileMeta> = AHashMap::new();
@@ -577,7 +572,7 @@ fn extend_with_children(
                     Path::new(&package.path),
                     filter,
                     source,
-                    package.is_local_dep && build_dev_deps,
+                    package.is_local_dep,
                 )
             })
             .collect::<Vec<AHashMap<PathBuf, SourceFileMeta>>>()
@@ -620,13 +615,12 @@ pub fn make(
     filter: &Option<regex::Regex>,
     project_context: &ProjectContext,
     show_progress: bool,
-    build_dev_deps: bool,
 ) -> Result<AHashMap<String, Package>> {
-    let map = read_packages(project_context, show_progress, build_dev_deps)?;
+    let map = read_packages(project_context, show_progress)?;
 
     /* Once we have the deduplicated packages, we can add the source files for each - to minimize
      * the IO */
-    let result = extend_with_children(filter, map, build_dev_deps);
+    let result = extend_with_children(filter, map);
 
     Ok(result)
 }
diff --git a/rewatch/src/cli.rs b/rewatch/src/cli.rs
index a0e1ae3ee0..88e9ed8ba4 100644
--- a/rewatch/src/cli.rs
+++ b/rewatch/src/cli.rs
@@ -212,13 +212,10 @@ pub struct CreateSourceDirsArg {
 
 #[derive(Args, Debug, Clone, Copy)]
 pub struct DevArg {
-    /// Build development dependencies
+    /// Deprecated: Build development dependencies
     ///
-    /// This is the flag to also compile development dependencies
-    /// It's important to know that we currently do not discern between project src, and
-    /// dependencies. So enabling this flag will enable building _all_ development dependencies of
-    /// _all_ packages
-    #[arg(long, default_value_t = false, num_args = 0..=1)]
+    /// This is the flag no longer does anything and will be removed in future versions.
+    #[arg(long, default_value_t = false, num_args = 0..=1, hide = true)]
     pub dev: bool,
 }
 
diff --git a/rewatch/src/format.rs b/rewatch/src/format.rs
index 2fa918c930..e7bf5c5707 100644
--- a/rewatch/src/format.rs
+++ b/rewatch/src/format.rs
@@ -12,12 +12,7 @@ use crate::build::packages;
 use crate::cli::FileExtension;
 use clap::ValueEnum;
 
-pub fn format(
-    stdin_extension: Option<FileExtension>,
-    check: bool,
-    files: Vec<String>,
-    format_dev_deps: bool,
-) -> Result<()> {
+pub fn format(stdin_extension: Option<FileExtension>, check: bool, files: Vec<String>) -> Result<()> {
     let bsc_path = helpers::get_bsc();
 
     match stdin_extension {
@@ -26,7 +21,7 @@ pub fn format(
         }
         None => {
             let files = if files.is_empty() {
-                get_files_in_scope(format_dev_deps)?
+                get_files_in_scope()?
             } else {
                 files
             };
@@ -37,13 +32,13 @@ pub fn format(
     Ok(())
 }
 
-fn get_files_in_scope(format_dev_deps: bool) -> Result<Vec<String>> {
+fn get_files_in_scope() -> Result<Vec<String>> {
     let current_dir = std::env::current_dir()?;
     let project_context = project_context::ProjectContext::new(&current_dir)?;
 
-    let packages = packages::make(&None, &project_context, false, format_dev_deps)?;
+    let packages = packages::make(&None, &project_context, false)?;
     let mut files: Vec<String> = Vec::new();
-    let packages_to_format = project_context.get_scoped_local_packages(format_dev_deps);
+    let packages_to_format = project_context.get_scoped_local_packages();
 
     for (_package_name, package) in packages {
         if packages_to_format.contains(&package.name)
diff --git a/rewatch/src/main.rs b/rewatch/src/main.rs
index 9ba43299b5..c54844da3e 100644
--- a/rewatch/src/main.rs
+++ b/rewatch/src/main.rs
@@ -36,13 +36,18 @@ fn main() -> Result<()> {
         cli::Command::Build(build_args) => {
             let _lock = get_lock(&build_args.folder);
 
+            if build_args.dev.dev {
+                log::warn!(
+                    "`--dev no longer has any effect. Please remove it from your command. It will be removed in a future version."
+                );
+            }
+
             match build::build(
                 &build_args.filter,
                 Path::new(&build_args.folder as &str),
                 show_progress,
                 build_args.no_timing,
                 *build_args.create_sourcedirs,
-                *build_args.dev,
                 *build_args.snapshot_output,
                 build_args.warn_error.clone(),
             ) {
@@ -61,13 +66,18 @@ fn main() -> Result<()> {
         cli::Command::Watch(watch_args) => {
             let _lock = get_lock(&watch_args.folder);
 
+            if watch_args.dev.dev {
+                log::warn!(
+                    "`--dev no longer has any effect. Please remove it from your command. It will be removed in a future version."
+                );
+            }
+
             watcher::start(
                 &watch_args.filter,
                 show_progress,
                 &watch_args.folder,
                 (*watch_args.after_build).clone(),
                 *watch_args.create_sourcedirs,
-                *watch_args.dev,
                 *watch_args.snapshot_output,
                 watch_args.warn_error.clone(),
             );
@@ -81,19 +91,27 @@ fn main() -> Result<()> {
         } => {
             let _lock = get_lock(&folder);
 
-            build::clean::clean(
-                Path::new(&folder as &str),
-                show_progress,
-                *snapshot_output,
-                dev.dev,
-            )
+            if dev.dev {
+                log::warn!(
+                    "`--dev no longer has any effect. Please remove it from your command. It will be removed in a future version."
+                );
+            }
+
+            build::clean::clean(Path::new(&folder as &str), show_progress, *snapshot_output)
         }
         cli::Command::Format {
             stdin,
             check,
             files,
             dev,
-        } => format::format(stdin, check, files, dev.dev),
+        } => {
+            if dev.dev {
+                log::warn!(
+                    "`--dev no longer has any effect. Please remove it from your command. It will be removed in a future version."
+                );
+            }
+            format::format(stdin, check, files)
+        }
     }
 }
 
diff --git a/rewatch/src/project_context.rs b/rewatch/src/project_context.rs
index 439e3d58e2..ccbb7ab8c3 100644
--- a/rewatch/src/project_context.rs
+++ b/rewatch/src/project_context.rs
@@ -226,7 +226,7 @@ impl ProjectContext {
 
     /// Returns the local packages relevant for the current context.
     /// Either a single project, all projects from a monorepo or a single package inside a monorepo.
-    pub fn get_scoped_local_packages(&self, include_dev_deps: bool) -> AHashSet<String> {
+    pub fn get_scoped_local_packages(&self) -> AHashSet<String> {
         let mut local_packages = AHashSet::<String>::new();
         match &self.monorepo_context {
             None => {
@@ -238,9 +238,7 @@ impl ProjectContext {
             }) => {
                 local_packages.insert(self.current_config.name.clone());
                 local_packages.extend(local_dependencies.iter().cloned());
-                if include_dev_deps {
-                    local_packages.extend(local_dev_dependencies.iter().cloned());
-                }
+                local_packages.extend(local_dev_dependencies.iter().cloned());
             }
             Some(MonoRepoContext::MonorepoPackage { .. }) => {
                 local_packages.insert(self.current_config.name.clone());
diff --git a/rewatch/src/watcher.rs b/rewatch/src/watcher.rs
index 114098eefb..642d552fef 100644
--- a/rewatch/src/watcher.rs
+++ b/rewatch/src/watcher.rs
@@ -62,7 +62,6 @@ struct AsyncWatchArgs<'a> {
     filter: &'a Option<regex::Regex>,
     after_build: Option<String>,
     create_sourcedirs: bool,
-    build_dev_deps: bool,
     snapshot_output: bool,
     warn_error: Option<String>,
 }
@@ -75,21 +74,13 @@ async fn async_watch(
         filter,
         after_build,
         create_sourcedirs,
-        build_dev_deps,
         snapshot_output,
         warn_error,
     }: AsyncWatchArgs<'_>,
 ) -> notify::Result<()> {
-    let mut build_state: build::build_types::BuildCommandState = build::initialize_build(
-        None,
-        filter,
-        show_progress,
-        path,
-        build_dev_deps,
-        snapshot_output,
-        warn_error,
-    )
-    .expect("Can't initialize build");
+    let mut build_state: build::build_types::BuildCommandState =
+        build::initialize_build(None, filter, show_progress, path, snapshot_output, warn_error)
+            .expect("Can't initialize build");
     let mut needs_compile_type = CompileType::Incremental;
     // create a mutex to capture if ctrl-c was pressed
     let ctrlc_pressed = Arc::new(Mutex::new(false));
@@ -283,7 +274,6 @@ async fn async_watch(
                     filter,
                     show_progress,
                     path,
-                    build_dev_deps,
                     snapshot_output,
                     build_state.get_warn_error_override(),
                 )
@@ -331,7 +321,6 @@ pub fn start(
     folder: &str,
     after_build: Option<String>,
     create_sourcedirs: bool,
-    build_dev_deps: bool,
     snapshot_output: bool,
     warn_error: Option<String>,
 ) {
@@ -358,7 +347,6 @@ pub fn start(
             filter,
             after_build,
             create_sourcedirs,
-            build_dev_deps,
             snapshot_output,
             warn_error: warn_error.clone(),
         })
diff --git a/rewatch/testrepo/packages/nonexisting-dev-files/package.json b/rewatch/testrepo/packages/nonexisting-dev-files/package.json
deleted file mode 100644
index 7af67a1eea..0000000000
--- a/rewatch/testrepo/packages/nonexisting-dev-files/package.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "@testrepo/nonexisting-dev-files",
-  "version": "0.0.1",
-  "keywords": [
-    "rescript"
-  ],
-  "author": "",
-  "license": "MIT"
-}
diff --git a/rewatch/testrepo/packages/nonexisting-dev-files/rescript.json b/rewatch/testrepo/packages/nonexisting-dev-files/rescript.json
deleted file mode 100644
index 7eb6700ad8..0000000000
--- a/rewatch/testrepo/packages/nonexisting-dev-files/rescript.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "@testrepo/nonexisting-dev-files",
-  "sources": {
-    "dir": "dev",
-    "subdirs": true,
-    "type": "dev"
-  }
-}
diff --git a/rewatch/testrepo/packages/pure-dev/dev/RealDev.mjs b/rewatch/testrepo/packages/pure-dev/dev/RealDev.mjs
new file mode 100644
index 0000000000..a464d3726f
--- /dev/null
+++ b/rewatch/testrepo/packages/pure-dev/dev/RealDev.mjs
@@ -0,0 +1,9 @@
+// Generated by ReScript, PLEASE EDIT WITH CARE
+
+
+let dev = true;
+
+export {
+  dev,
+}
+/* No side effect */
diff --git a/rewatch/testrepo/packages/pure-dev/rescript.json b/rewatch/testrepo/packages/pure-dev/rescript.json
index 7eb6700ad8..ef378678f3 100644
--- a/rewatch/testrepo/packages/pure-dev/rescript.json
+++ b/rewatch/testrepo/packages/pure-dev/rescript.json
@@ -1,5 +1,5 @@
 {
-  "name": "@testrepo/nonexisting-dev-files",
+  "name": "@testrepo/pure-dev",
   "sources": {
     "dir": "dev",
     "subdirs": true,
diff --git a/rewatch/testrepo/packages/with-dev-deps/test/FileToTest_test.mjs b/rewatch/testrepo/packages/with-dev-deps/test/FileToTest_test.mjs
new file mode 100644
index 0000000000..4e171bebcf
--- /dev/null
+++ b/rewatch/testrepo/packages/with-dev-deps/test/FileToTest_test.mjs
@@ -0,0 +1,18 @@
+// Generated by ReScript, PLEASE EDIT WITH CARE
+
+import * as FileToTest from "../src/FileToTest.mjs";
+import * as Pervasives from "@rescript/runtime/lib/es6/Pervasives.js";
+
+let res = FileToTest.add(1, 2);
+
+if (res !== 3) {
+  Pervasives.failwith("Expected " + (3).toString() + ", got " + res.toString());
+}
+
+let expected = 3;
+
+export {
+  res,
+  expected,
+}
+/* res Not a pure module */
diff --git a/rewatch/testrepo/rescript.json b/rewatch/testrepo/rescript.json
index 99f5820560..3141aedeb4 100644
--- a/rewatch/testrepo/rescript.json
+++ b/rewatch/testrepo/rescript.json
@@ -21,7 +21,6 @@
     "@testrepo/new-namespace",
     "@testrepo/namespace-casing",
     "@testrepo/with-dev-deps",
-    "@testrepo/nonexisting-dev-files",
     "@testrepo/deprecated-config",
     "@testrepo/file-casing",
     "@testrepo/file-casing-no-namespace",
diff --git a/rewatch/testrepo/yarn.lock b/rewatch/testrepo/yarn.lock
index 7cd4a2e3e8..8cac1e8d2c 100644
--- a/rewatch/testrepo/yarn.lock
+++ b/rewatch/testrepo/yarn.lock
@@ -145,12 +145,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@testrepo/nonexisting-dev-files@workspace:packages/nonexisting-dev-files":
-  version: 0.0.0-use.local
-  resolution: "@testrepo/nonexisting-dev-files@workspace:packages/nonexisting-dev-files"
-  languageName: unknown
-  linkType: soft
-
 "@testrepo/pure-dev@workspace:packages/pure-dev":
   version: 0.0.0-use.local
   resolution: "@testrepo/pure-dev@workspace:packages/pure-dev"
diff --git a/rewatch/tests/clean.sh b/rewatch/tests/clean.sh
index 3d67e46275..84d57011e3 100755
--- a/rewatch/tests/clean.sh
+++ b/rewatch/tests/clean.sh
@@ -48,10 +48,10 @@ else
   exit 1
 fi
 
-bold "--dev should clean dev-dependencies of monorepo"
+bold "-should clean dev-dependencies of monorepo"
 
-# First we build the entire monorepo (including --dev)
-error_output=$(rewatch build --dev 2>&1)
+# First we build the entire monorepo
+error_output=$(rewatch build 2>&1)
 if [ $? -eq 0 ];
 then
   success "Built monorepo"
@@ -61,8 +61,8 @@ else
   exit 1
 fi
 
-# Clean entire monorepo (including --dev)
-error_output=$(rewatch clean --dev 2>&1)
+# Clean entire monorepo
+error_output=$(rewatch clean 2>&1)
 clean_status=$?
 if [ $clean_status -ne 0 ];
 then
diff --git a/rewatch/tests/compile.sh b/rewatch/tests/compile.sh
index 9287eada3f..5f981610bc 100755
--- a/rewatch/tests/compile.sh
+++ b/rewatch/tests/compile.sh
@@ -100,9 +100,9 @@ rewatch build --snapshot-output &> ../tests/snapshots/bs-dev-dependency-used-by-
 normalize_paths ../tests/snapshots/bs-dev-dependency-used-by-non-dev-source.txt
 git checkout -- packages/with-dev-deps/src/FileToTest.res
 
-# it should compile dev dependencies with the --dev flag
-rewatch clean --dev &> /dev/null
-rewatch build --dev &> /dev/null;
+# it should compile dev dependencies
+rewatch clean &> /dev/null
+rewatch build &> /dev/null;
 if [ $? -ne 0 ];
 then
   error "Failed to compile dev dependencies"
@@ -115,11 +115,11 @@ if [ "$file_count" -eq $expected_file_count ];
 then
   success "Compiled dev dependencies successfully"
 else
-  error "Expected $expected_file_count files to be compiled with the --dev flag, found $file_count"
+  error "Expected $expected_file_count files to be compiled, found $file_count"
   exit 1
 fi
 
-error_output=$(rewatch clean --dev 2>&1 >/dev/null)
+error_output=$(rewatch clean 2>&1 >/dev/null)
 file_count=$(find ./packages/with-dev-deps -name *.mjs | wc -l)
 if [ "$file_count" -eq 0 ];
 then
diff --git a/rewatch/tests/format.sh b/rewatch/tests/format.sh
index f96403c8dd..69e8337514 100755
--- a/rewatch/tests/format.sh
+++ b/rewatch/tests/format.sh
@@ -6,7 +6,7 @@ bold "Test: It should format all files"
 git diff --name-only ./
 error_output=$("$REWATCH_EXECUTABLE" format)
 git_diff_file_count=$(git diff --name-only ./ | wc -l | xargs)
-if [ $? -eq 0 ] && [ $git_diff_file_count -eq 8 ];
+if [ $? -eq 0 ] && [ $git_diff_file_count -eq 9 ];
 then
     success "Test package formatted. Got $git_diff_file_count changed files."
     git restore .
@@ -57,18 +57,3 @@ else
     echo $error_output
     exit 1
 fi
-
-bold "Test: it should format dev package as well"
-
-error_output=$("$REWATCH_EXECUTABLE" format --dev)
-git_diff_file_count=$(git diff --name-only ./ | wc -l | xargs)
-if [ $? -eq 0 ] && [ $git_diff_file_count -eq 9 ];
-then
-    success "All packages (including dev) were formatted. Got $git_diff_file_count changed files."
-    git restore .
-else
-    error "Error formatting test package"
-    echo "Expected 9 files to be changed, got $git_diff_file_count"
-    echo $error_output
-    exit 1
-fi
\ No newline at end of file
diff --git a/rewatch/tests/snapshots/bs-dev-dependency-used-by-non-dev-source.txt b/rewatch/tests/snapshots/bs-dev-dependency-used-by-non-dev-source.txt
index 3bdc9aa03f..393f245c5b 100644
--- a/rewatch/tests/snapshots/bs-dev-dependency-used-by-non-dev-source.txt
+++ b/rewatch/tests/snapshots/bs-dev-dependency-used-by-non-dev-source.txt
@@ -1,4 +1,4 @@
-Cleaned 0/114
+Cleaned 0/428
 Parsed 2 source files
 Compiled 2 modules
 
diff --git a/rewatch/tests/snapshots/clean-rebuild.txt b/rewatch/tests/snapshots/clean-rebuild.txt
index 5126847c58..9fa176a312 100644
--- a/rewatch/tests/snapshots/clean-rebuild.txt
+++ b/rewatch/tests/snapshots/clean-rebuild.txt
@@ -1,6 +1,6 @@
 Cleaned 0/0
-Parsed 111 source files
-Compiled 111 modules
+Parsed 425 source files
+Compiled 425 modules
 
 The field 'bs-dependencies' found in the package config of '@testrepo/deprecated-config' is deprecated and will be removed in a future version.
 Use 'dependencies' instead.
diff --git a/rewatch/tests/snapshots/dependency-cycle.txt b/rewatch/tests/snapshots/dependency-cycle.txt
index 1adb5c1739..7bf2339c9b 100644
--- a/rewatch/tests/snapshots/dependency-cycle.txt
+++ b/rewatch/tests/snapshots/dependency-cycle.txt
@@ -1,4 +1,4 @@
-Cleaned 0/114
+Cleaned 0/428
 Parsed 1 source files
 Compiled 0 modules
 
diff --git a/rewatch/tests/snapshots/remove-file.txt b/rewatch/tests/snapshots/remove-file.txt
index 7a4eaf35e3..3ca1a9fb91 100644
--- a/rewatch/tests/snapshots/remove-file.txt
+++ b/rewatch/tests/snapshots/remove-file.txt
@@ -1,4 +1,4 @@
-Cleaned 1/114
+Cleaned 1/428
 Parsed 0 source files
 Compiled 1 modules
 
diff --git a/rewatch/tests/snapshots/rename-file-internal-dep-namespace.txt b/rewatch/tests/snapshots/rename-file-internal-dep-namespace.txt
index 56c1ffa989..26d085b182 100644
--- a/rewatch/tests/snapshots/rename-file-internal-dep-namespace.txt
+++ b/rewatch/tests/snapshots/rename-file-internal-dep-namespace.txt
@@ -1,4 +1,4 @@
-Cleaned 2/114
+Cleaned 2/428
 Parsed 2 source files
 Compiled 3 modules
 
diff --git a/rewatch/tests/snapshots/rename-file-internal-dep.txt b/rewatch/tests/snapshots/rename-file-internal-dep.txt
index f211beabfe..1459c2381b 100644
--- a/rewatch/tests/snapshots/rename-file-internal-dep.txt
+++ b/rewatch/tests/snapshots/rename-file-internal-dep.txt
@@ -1,4 +1,4 @@
-Cleaned 2/114
+Cleaned 2/428
 Parsed 2 source files
 Compiled 2 modules
 
diff --git a/rewatch/tests/snapshots/rename-file-with-interface.txt b/rewatch/tests/snapshots/rename-file-with-interface.txt
index cc7132711e..942e802943 100644
--- a/rewatch/tests/snapshots/rename-file-with-interface.txt
+++ b/rewatch/tests/snapshots/rename-file-with-interface.txt
@@ -1,5 +1,5 @@
 
 No implementation file found for interface file (skipping): src/ModuleWithInterface.resi
-Cleaned 2/114
+Cleaned 2/428
 Parsed 1 source files
 Compiled 2 modules
 
diff --git a/rewatch/tests/snapshots/rename-file.txt b/rewatch/tests/snapshots/rename-file.txt
index a4e772670a..b316e37ff4 100644
--- a/rewatch/tests/snapshots/rename-file.txt
+++ b/rewatch/tests/snapshots/rename-file.txt
@@ -1,4 +1,4 @@
-Cleaned 1/114
+Cleaned 1/428
 Parsed 1 source files
 Compiled 1 modules
 
diff --git a/rewatch/tests/snapshots/rename-interface-file.txt b/rewatch/tests/snapshots/rename-interface-file.txt
index 91ccacc104..d5e13249dd 100644
--- a/rewatch/tests/snapshots/rename-interface-file.txt
+++ b/rewatch/tests/snapshots/rename-interface-file.txt
@@ -1,5 +1,5 @@
 
 No implementation file found for interface file (skipping): src/ModuleWithInterface2.resi
-Cleaned 1/114
+Cleaned 1/428
 Parsed 1 source files
 Compiled 2 modules
 
diff --git a/rewatch/tests/suffix.sh b/rewatch/tests/suffix.sh
index e6747c5409..fc5436ebdb 100755
--- a/rewatch/tests/suffix.sh
+++ b/rewatch/tests/suffix.sh
@@ -31,7 +31,7 @@ fi
 # Count files with new extension
 file_count=$(find ./packages -name *.res.js | wc -l)
 
-if [ "$file_count" -eq 132 ];
+if [ "$file_count" -eq 136 ];
 then
   success "Found files with correct suffix"
 else
diff --git a/rewatch/tests/watch.sh b/rewatch/tests/watch.sh
index 229cd01f97..2a5b36bb77 100755
--- a/rewatch/tests/watch.sh
+++ b/rewatch/tests/watch.sh
@@ -36,9 +36,9 @@ success "Watcher Started"
 # Trigger a recompilation
 echo 'Js.log("added-by-test")' >> ./packages/main/src/Main.res
 
-# Wait for the compiled JS to show up (Windows CI can be slower)
+# Wait for the compiled JS to show up (can be slow in CI)
 target=./packages/main/src/Main.mjs
-if ! wait_for_file "$target" 10; then
+if ! wait_for_file "$target" 20; then
   error "Expected output not found: $target"
   ls -la ./packages/main/src || true
   tail -n 200 rewatch.log || true
@@ -59,7 +59,7 @@ sleep 1
 
 replace '/Js.log("added-by-test")/d' ./packages/main/src/Main.res;
 
-sleep 1
+sleep 5
 
 if git diff --exit-code ./
 then