diff --git a/templates/web-demo/rules-extra.mk b/templates/web-demo/rules-extra-web-demo.mk
similarity index 100%
rename from templates/web-demo/rules-extra.mk
rename to templates/web-demo/rules-extra-web-demo.mk
diff --git a/templates/web-demo/tibia-index.js b/templates/web-demo/tibia-index.js
index 9cefaa8..a6782f5 100644
--- a/templates/web-demo/tibia-index.js
+++ b/templates/web-demo/tibia-index.js
@@ -23,6 +23,6 @@ var sep = path.sep;
 
 module.exports = function (data, api) {
 	api.generateFileFromTemplateFile(`src${sep}index.html`, `src${sep}index.html`, data);
-	api.copyFile(`vars-extra.mk`, `vars-extra.mk`);
-	api.copyFile(`rules-extra.mk`, `rules-extra.mk`);
+	api.copyFile(`vars-extra-web-demo.mk`, `vars-extra-web-demo.mk`);
+	api.copyFile(`rules-extra-web-demo.mk`, `rules-extra-web-demo.mk`);
 };
diff --git a/templates/web-demo/vars-extra.mk b/templates/web-demo/vars-extra-web-demo.mk
similarity index 100%
rename from templates/web-demo/vars-extra.mk
rename to templates/web-demo/vars-extra-web-demo.mk
diff --git a/test/make.json b/test/make.json
deleted file mode 100644
index 247e7c2..0000000
--- a/test/make.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	"make": {
-		"mkincDir": "../mk"
-	}
-}
diff --git a/test/rules-extra.mk b/test/rules-extra.mk
new file mode 100644
index 0000000..1949e52
--- /dev/null
+++ b/test/rules-extra.mk
@@ -0,0 +1 @@
+include rules-extra-web-demo.mk
diff --git a/test/run.sh b/test/run.sh
index 10a15fe..db3861f 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -2,37 +2,41 @@
 
 dir=`dirname $0`
 
-mkdir -p $dir/../out/mk
-cp $dir/vars-pre.mk $dir/../out/mk
-
 $dir/../tibia $dir/product.json,$dir/company.json $dir/../templates/api $dir/../out/api
 
 $dir/../tibia $dir/product.json,$dir/company.json,$dir/vst3.json $dir/../templates/vst3 $dir/../out/vst3
-$dir/../tibia $dir/product.json,$dir/company.json,$dir/vst3.json,$dir/make.json $dir/../templates/vst3-make $dir/../out/vst3
+$dir/../tibia $dir/product.json,$dir/company.json,$dir/vst3.json $dir/../templates/vst3-make $dir/../out/vst3
 cp $dir/plugin.h $dir/plugin_ui.h $dir/../out/vst3/src
+cp $dir/vars-pre.mk $dir/../out/vst3
 
 $dir/../tibia $dir/product.json,$dir/company.json,$dir/lv2.json $dir/../templates/lv2 $dir/../out/lv2
-$dir/../tibia $dir/product.json,$dir/company.json,$dir/lv2.json,$dir/make.json $dir/../templates/lv2-make $dir/../out/lv2
+$dir/../tibia $dir/product.json,$dir/company.json,$dir/lv2.json $dir/../templates/lv2-make $dir/../out/lv2
 cp $dir/plugin.h $dir/plugin_ui.h $dir/../out/lv2/src
+cp $dir/vars-pre.mk $dir/../out/lv2
 
 $dir/../tibia $dir/product.json,$dir/company.json $dir/../templates/web $dir/../out/web
-$dir/../tibia $dir/product.json,$dir/company.json,$dir/make.json $dir/../templates/web-make $dir/../out/web
+$dir/../tibia $dir/product.json,$dir/company.json $dir/../templates/web-make $dir/../out/web
 $dir/../tibia $dir/product.json,$dir/company.json $dir/../templates/web-demo $dir/../out/web
 cp $dir/plugin.h $dir/../out/web/src
+cp $dir/vars-pre.mk $dir/vars-extra.mk $dir/rules-extra.mk $dir/../out/web
 
 $dir/../tibia $dir/product.json,$dir/company.json,$dir/android.json $dir/../templates/android $dir/../out/android
-$dir/../tibia $dir/product.json,$dir/company.json,$dir/android.json,$dir/make.json $dir/../templates/android-make $dir/../out/android
+$dir/../tibia $dir/product.json,$dir/company.json,$dir/android.json $dir/../templates/android-make $dir/../out/android
 cp $dir/keystore.jks $dir/../out/android
 cp $dir/plugin.h $dir/../out/android/src
+cp $dir/vars-pre.mk $dir/../out/android
 
 $dir/../tibia $dir/product.json,$dir/company.json,$dir/ios.json $dir/../templates/ios $dir/../out/ios
-$dir/../tibia $dir/product.json,$dir/company.json,$dir/ios.json,$dir/make.json,$dir/ios-make.json $dir/../templates/ios-make $dir/../out/ios
+$dir/../tibia $dir/product.json,$dir/company.json,$dir/ios.json,$dir/ios-make.json $dir/../templates/ios-make $dir/../out/ios
 cp $dir/plugin.h $dir/../out/ios/src
+cp $dir/vars-pre.mk $dir/../out/ios
 
 $dir/../tibia $dir/product.json,$dir/company.json $dir/../templates/cmd $dir/../out/cmd
-$dir/../tibia $dir/product.json,$dir/company.json,$dir/make.json $dir/../templates/cmd-make $dir/../out/cmd
+$dir/../tibia $dir/product.json,$dir/company.json $dir/../templates/cmd-make $dir/../out/cmd
 cp $dir/plugin.h $dir/../out/cmd/src
+cp $dir/vars-pre.mk $dir/../out/cmd
 
 $dir/../tibia $dir/product.json,$dir/company.json,$dir/daisy-seed.json $dir/../templates/daisy-seed $dir/../out/daisy-seed
-$dir/../tibia $dir/product.json,$dir/company.json,$dir/daisy-seed.json,$dir/make.json $dir/../templates/daisy-seed-make $dir/../out/daisy-seed
+$dir/../tibia $dir/product.json,$dir/company.json,$dir/daisy-seed.json $dir/../templates/daisy-seed-make $dir/../out/daisy-seed
 cp $dir/plugin.h $dir/../out/daisy-seed/src
+cp $dir/vars-pre.mk $dir/../out/daisy-seed
diff --git a/test/vars-extra.mk b/test/vars-extra.mk
new file mode 100644
index 0000000..e39c2e6
--- /dev/null
+++ b/test/vars-extra.mk
@@ -0,0 +1 @@
+include vars-extra-web-demo.mk