diff --git a/test/cli/node_modules/bar/lib/config.js b/test/cli/node_modules/bar/lib/config.js
deleted file mode 100644
index 785d84d0212..00000000000
--- a/test/cli/node_modules/bar/lib/config.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const replace = require( '@rollup/plugin-replace' );
-
-module.exports = {
-	input: 'main.js',
-	output: {
-		format: 'cjs'
-	},
-	plugins: [
-		replace( { ANSWER: 42 } )
-	]
-};
diff --git a/test/cli/node_modules/bar/package.json b/test/cli/node_modules/bar/package.json
deleted file mode 100644
index fbd490130d0..00000000000
--- a/test/cli/node_modules/bar/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	"main": "lib/config.js"
-}
diff --git a/test/cli/node_modules/rollup-config-foo/lib/config.js b/test/cli/node_modules/rollup-config-foo/lib/config.js
deleted file mode 100644
index 785d84d0212..00000000000
--- a/test/cli/node_modules/rollup-config-foo/lib/config.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const replace = require( '@rollup/plugin-replace' );
-
-module.exports = {
-	input: 'main.js',
-	output: {
-		format: 'cjs'
-	},
-	plugins: [
-		replace( { ANSWER: 42 } )
-	]
-};
diff --git a/test/cli/node_modules/rollup-config-foo/package.json b/test/cli/node_modules/rollup-config-foo/package.json
deleted file mode 100644
index fbd490130d0..00000000000
--- a/test/cli/node_modules/rollup-config-foo/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	"main": "lib/config.js"
-}
diff --git a/test/cli/samples/watch/bundle-error/main.js b/test/cli/samples/watch/bundle-error/main.js
index 1352aefa03e..a4012bff06c 100644
--- a/test/cli/samples/watch/bundle-error/main.js
+++ b/test/cli/samples/watch/bundle-error/main.js
@@ -1 +1 @@
-<=>
\ No newline at end of file
+export default 42;
\ No newline at end of file
diff --git a/test/cli/samples/watch/watch-config-early-update/rollup.config.js b/test/cli/samples/watch/watch-config-early-update/rollup.config.js
index f6d6c59bddd..ec6ec213bce 100644
--- a/test/cli/samples/watch/watch-config-early-update/rollup.config.js
+++ b/test/cli/samples/watch/watch-config-early-update/rollup.config.js
@@ -1,24 +1,9 @@
 
-			import path from 'path';
-		  import fs from 'fs';
-		  const messageFile = path.resolve(__dirname, '_actual', 'message.txt');
-		  export default new Promise(resolve => {
-		    fs.writeFileSync(messageFile, 'loading');
-		    const watcher = fs.watch(messageFile, event => {
-		      if (event === 'change') {
-		        const content = fs.readFileSync(messageFile, 'utf8');
-		        if (content === 'loaded') {
-		          watcher.close();
-		          fs.writeFileSync(messageFile, 'resolved');
-		          resolve({
-		            input: {output1: "main.js"},
+		          export default {
+		            input: {output2: "main.js"},
 		            output: {
 		              dir: "_actual",
 		              format: "es"
 		            }
-		          });
-		        }
-		      }
-		    });
-		  });
-		
\ No newline at end of file
+		          };
+		        
\ No newline at end of file
diff --git a/test/cli/samples/watch/watch-config/rollup.config.js b/test/cli/samples/watch/watch-config/rollup.config.js
index 13c3a05fe47..2f5615a36b2 100644
--- a/test/cli/samples/watch/watch-config/rollup.config.js
+++ b/test/cli/samples/watch/watch-config/rollup.config.js
@@ -1 +1,7 @@
-throw new Error("Config contains initial errors");
\ No newline at end of file
+export default {
+	input: {output: "main4.js"},
+	output: {
+		dir: "_actual",
+		format: "es"
+	}
+};
\ No newline at end of file