diff --git a/tests/functional/lang/parse-okay-inherits.nix b/tests/functional2/lang/inherits/in.nix
similarity index 100%
rename from tests/functional/lang/parse-okay-inherits.nix
rename to tests/functional2/lang/inherits/in.nix
diff --git a/tests/functional/lang/parse-okay-inherits.exp b/tests/functional2/lang/inherits/parse-okay.out.exp
similarity index 100%
rename from tests/functional/lang/parse-okay-inherits.exp
rename to tests/functional2/lang/inherits/parse-okay.out.exp
diff --git a/tests/functional/lang/parse-okay-json.nix b/tests/functional2/lang/json/in.nix
similarity index 100%
rename from tests/functional/lang/parse-okay-json.nix
rename to tests/functional2/lang/json/in.nix
diff --git a/tests/functional/lang/parse-okay-json.exp b/tests/functional2/lang/json/parse-okay.out.exp
similarity index 100%
rename from tests/functional/lang/parse-okay-json.exp
rename to tests/functional2/lang/json/parse-okay.out.exp
diff --git a/tests/functional/lang/parse-okay-regression-751.nix b/tests/functional2/lang/regression-751/in.nix
similarity index 100%
rename from tests/functional/lang/parse-okay-regression-751.nix
rename to tests/functional2/lang/regression-751/in.nix
diff --git a/tests/functional/lang/parse-okay-regression-751.exp b/tests/functional2/lang/regression-751/parse-okay.out.exp
similarity index 100%
rename from tests/functional/lang/parse-okay-regression-751.exp
rename to tests/functional2/lang/regression-751/parse-okay.out.exp
diff --git a/tests/functional/lang/parse-okay-subversion.nix b/tests/functional2/lang/subversion/in.nix
similarity index 100%
rename from tests/functional/lang/parse-okay-subversion.nix
rename to tests/functional2/lang/subversion/in.nix
diff --git a/tests/functional/lang/parse-okay-subversion.exp b/tests/functional2/lang/subversion/parse-okay.out.exp
similarity index 100%
rename from tests/functional/lang/parse-okay-subversion.exp
rename to tests/functional2/lang/subversion/parse-okay.out.exp