diff --git a/test/Flang-Driver/Inputs/basic-header-one.h b/test/Driver/Inputs/basic-header-one.h
similarity index 100%
rename from test/Flang-Driver/Inputs/basic-header-one.h
rename to test/Driver/Inputs/basic-header-one.h
diff --git a/test/Flang-Driver/Inputs/basic-header-two.h b/test/Driver/Inputs/basic-header-two.h
similarity index 100%
rename from test/Flang-Driver/Inputs/basic-header-two.h
rename to test/Driver/Inputs/basic-header-two.h
diff --git a/test/Flang-Driver/Inputs/basictestmoduleone.mod b/test/Driver/Inputs/basictestmoduleone.mod
similarity index 100%
rename from test/Flang-Driver/Inputs/basictestmoduleone.mod
rename to test/Driver/Inputs/basictestmoduleone.mod
diff --git a/test/Flang-Driver/Inputs/fixed-form-test.f b/test/Driver/Inputs/fixed-form-test.f
similarity index 100%
rename from test/Flang-Driver/Inputs/fixed-form-test.f
rename to test/Driver/Inputs/fixed-form-test.f
diff --git a/test/Flang-Driver/Inputs/fixed-line-length-test.f b/test/Driver/Inputs/fixed-line-length-test.f
similarity index 100%
rename from test/Flang-Driver/Inputs/fixed-line-length-test.f
rename to test/Driver/Inputs/fixed-line-length-test.f
diff --git a/test/Flang-Driver/Inputs/free-form-test.f90 b/test/Driver/Inputs/free-form-test.f90
similarity index 100%
rename from test/Flang-Driver/Inputs/free-form-test.f90
rename to test/Driver/Inputs/free-form-test.f90
diff --git a/test/Flang-Driver/Inputs/header-dir/basic-header-one.h b/test/Driver/Inputs/header-dir/basic-header-one.h
similarity index 100%
rename from test/Flang-Driver/Inputs/header-dir/basic-header-one.h
rename to test/Driver/Inputs/header-dir/basic-header-one.h
diff --git a/test/Flang-Driver/Inputs/header-dir/basic-header-two.h b/test/Driver/Inputs/header-dir/basic-header-two.h
similarity index 100%
rename from test/Flang-Driver/Inputs/header-dir/basic-header-two.h
rename to test/Driver/Inputs/header-dir/basic-header-two.h
diff --git a/test/Flang-Driver/Inputs/module-dir/basictestmoduleone.mod b/test/Driver/Inputs/module-dir/basictestmoduleone.mod
similarity index 100%
rename from test/Flang-Driver/Inputs/module-dir/basictestmoduleone.mod
rename to test/Driver/Inputs/module-dir/basictestmoduleone.mod
diff --git a/test/Flang-Driver/Inputs/module-dir/basictestmoduletwo.mod b/test/Driver/Inputs/module-dir/basictestmoduletwo.mod
similarity index 100%
rename from test/Flang-Driver/Inputs/module-dir/basictestmoduletwo.mod
rename to test/Driver/Inputs/module-dir/basictestmoduletwo.mod
diff --git a/test/Flang-Driver/code-gen.f90 b/test/Driver/code-gen.f90
similarity index 100%
rename from test/Flang-Driver/code-gen.f90
rename to test/Driver/code-gen.f90
diff --git a/test/Flang-Driver/debug-measure-parse-tree.f90 b/test/Driver/debug-measure-parse-tree.f90
similarity index 100%
rename from test/Flang-Driver/debug-measure-parse-tree.f90
rename to test/Driver/debug-measure-parse-tree.f90
diff --git a/test/Flang-Driver/debug-provenance.f90 b/test/Driver/debug-provenance.f90
similarity index 100%
rename from test/Flang-Driver/debug-provenance.f90
rename to test/Driver/debug-provenance.f90
diff --git a/test/Flang-Driver/driver-error-cc1.c b/test/Driver/driver-error-cc1.c
similarity index 100%
rename from test/Flang-Driver/driver-error-cc1.c
rename to test/Driver/driver-error-cc1.c
diff --git a/test/Flang-Driver/driver-error-cc1.cpp b/test/Driver/driver-error-cc1.cpp
similarity index 100%
rename from test/Flang-Driver/driver-error-cc1.cpp
rename to test/Driver/driver-error-cc1.cpp
diff --git a/test/Flang-Driver/driver-help-hidden.f90 b/test/Driver/driver-help-hidden.f90
similarity index 100%
rename from test/Flang-Driver/driver-help-hidden.f90
rename to test/Driver/driver-help-hidden.f90
diff --git a/test/Flang-Driver/driver-help.f90 b/test/Driver/driver-help.f90
similarity index 100%
rename from test/Flang-Driver/driver-help.f90
rename to test/Driver/driver-help.f90
diff --git a/test/Flang-Driver/driver-version.f90 b/test/Driver/driver-version.f90
similarity index 69%
rename from test/Flang-Driver/driver-version.f90
rename to test/Driver/driver-version.f90
index 199770b..a504635 100644
--- a/test/Flang-Driver/driver-version.f90
+++ b/test/Driver/driver-version.f90
@@ -3,9 +3,9 @@
 
 ! REQUIRES: new-flang-driver
 
-! CHECK:flang-new version 
-! CHECK-NEXT:Target:
-! CHECK-NEXT:Thread model:
-! CHECK-NEXT:InstalledDir:
+! CHECK: flang-new version
+! CHECK-NEXT: Target:
+! CHECK-NEXT: Thread model:
+! CHECK-NEXT: InstalledDir:
 
 ! ERROR: flang-new: error: unsupported option '--versions'; did you mean '--version'?
diff --git a/test/Flang-Driver/escaped-backslash.f90 b/test/Driver/escaped-backslash.f90
similarity index 100%
rename from test/Flang-Driver/escaped-backslash.f90
rename to test/Driver/escaped-backslash.f90
diff --git a/test/Flang-Driver/fdefault.f90 b/test/Driver/fdefault.f90
similarity index 100%
rename from test/Flang-Driver/fdefault.f90
rename to test/Driver/fdefault.f90
diff --git a/test/Flang-Driver/fixed-free-detection.f90 b/test/Driver/fixed-free-detection.f90
similarity index 100%
rename from test/Flang-Driver/fixed-free-detection.f90
rename to test/Driver/fixed-free-detection.f90
diff --git a/test/Flang-Driver/fixed-free-flag.f90 b/test/Driver/fixed-free-flag.f90
similarity index 100%
rename from test/Flang-Driver/fixed-free-flag.f90
rename to test/Driver/fixed-free-flag.f90
diff --git a/test/Flang-Driver/fixed-line-length.f90 b/test/Driver/fixed-line-length.f90
similarity index 100%
rename from test/Flang-Driver/fixed-line-length.f90
rename to test/Driver/fixed-line-length.f90
diff --git a/test/Flang-Driver/flarge_sizes.f90 b/test/Driver/flarge_sizes.f90
similarity index 100%
rename from test/Flang-Driver/flarge_sizes.f90
rename to test/Driver/flarge_sizes.f90
diff --git a/test/Flang-Driver/frontend-forwarding.f90 b/test/Driver/frontend-forwarding.f90
similarity index 100%
rename from test/Flang-Driver/frontend-forwarding.f90
rename to test/Driver/frontend-forwarding.f90
diff --git a/test/Driver/help.f90 b/test/Driver/help-f18.f90
similarity index 100%
rename from test/Driver/help.f90
rename to test/Driver/help-f18.f90
diff --git a/test/Flang-Driver/implicit-none.f90 b/test/Driver/implicit-none.f90
similarity index 100%
rename from test/Flang-Driver/implicit-none.f90
rename to test/Driver/implicit-none.f90
diff --git a/test/Flang-Driver/include-header.f90 b/test/Driver/include-header.f90
similarity index 100%
rename from test/Flang-Driver/include-header.f90
rename to test/Driver/include-header.f90
diff --git a/test/Driver/input-from-stdin.f90 b/test/Driver/input-from-stdin.f90
new file mode 100644
index 0000000..606cc41
--- /dev/null
+++ b/test/Driver/input-from-stdin.f90
@@ -0,0 +1,47 @@
+! Verify that reading from stdin works as expected
+
+! REQUIRES: new-flang-driver
+
+!--------------------------
+! FLANG DRIVER (flang)
+!--------------------------
+! Input type is implicit
+! RUN: cat %s | %flang -E - | FileCheck %s --check-prefix=PP-NOT-DEFINED
+! RUN: cat %s | %flang -DNEW -E - | FileCheck %s --check-prefix=PP-DEFINED
+
+! Input type is explicit
+! RUN: cat %s | %flang -E -x f95-cpp-input - | FileCheck %s --check-prefix=PP-NOT-DEFINED
+! RUN: cat %s | %flang -DNEW -E -x f95-cpp-input - | FileCheck %s --check-prefix=PP-DEFINED
+
+!---------------------------------------
+! FLANG FRONTEND DRIVER (flang -fc1)
+!---------------------------------------
+! Test `-E`: for the corresponding frontend actions the driver relies on the prescanner API to handle file I/O
+! RUN: cat %s | %flang -fc1 -E | FileCheck %s --check-prefix=PP-NOT-DEFINED
+! RUN: cat %s | %flang -fc1 -DNEW -E | FileCheck %s --check-prefix=PP-DEFINED
+
+! Test `-test-io`: for the corresponding frontend action (`InputOutputTestAction`) the driver handles the file I/O on its own
+! the corresponding action (`PrintPreprocessedAction`)
+! RUN: cat %s | %flang -fc1 -test-io | FileCheck %s --check-prefix=IO --match-full-lines
+! RUN: cat %s | %flang -fc1 -DNEW -test-io | FileCheck %s --check-prefix=IO --match-full-lines
+
+!-------------------------
+! EXPECTED OUTPUT for `-E`
+!-------------------------
+! PP-NOT-DEFINED: program b
+! PP-DEFINED: program a
+
+!-------------------------------
+! EXPECTED OUTPUT for `-test-io`
+!-------------------------------
+! IO: #ifdef NEW
+! IO-NEXT:   Program A
+! IO-NEXT: #else
+! IO-NEXT:   Program B
+! IO-NEXT: #endif
+
+#ifdef NEW
+  Program A
+#else
+  Program B
+#endif
diff --git a/test/Flang-Driver/macro-def-undef.f90 b/test/Driver/macro-def-undef.f90
similarity index 100%
rename from test/Flang-Driver/macro-def-undef.f90
rename to test/Driver/macro-def-undef.f90
diff --git a/test/Flang-Driver/macro-multiline.f90 b/test/Driver/macro-multiline.f90
similarity index 100%
rename from test/Flang-Driver/macro-multiline.f90
rename to test/Driver/macro-multiline.f90
diff --git a/test/Flang-Driver/missing-input.f90 b/test/Driver/missing-input.f90
similarity index 100%
rename from test/Flang-Driver/missing-input.f90
rename to test/Driver/missing-input.f90
diff --git a/test/Driver/no-files.f90 b/test/Driver/no-files.f90
deleted file mode 100644
index 718985d..0000000
--- a/test/Driver/no-files.f90
+++ /dev/null
@@ -1,10 +0,0 @@
-! RUN: %f18 < %S/Inputs/hello.f90 | FileCheck %s
-
-
-! CHECK: Enter Fortran source
-! CHECK: Use EOF character (^D) to end file
-
-! CHECK: Parse tree comprises {{.*}} objects and occupies {{.*}} total bytes
-! CHECK: PROGRAM hello
-! CHECK:  WRITE (*, *) "hello world"
-! CHECK: END PROGRAM hello
diff --git a/test/Flang-Driver/parse-error.f95 b/test/Driver/parse-error.f95
similarity index 100%
rename from test/Flang-Driver/parse-error.f95
rename to test/Driver/parse-error.f95
diff --git a/test/Flang-Driver/phases.f90 b/test/Driver/phases.f90
similarity index 100%
rename from test/Flang-Driver/phases.f90
rename to test/Driver/phases.f90
diff --git a/test/Flang-Driver/predefined-macros-compiler-version.f90 b/test/Driver/predefined-macros-compiler-version.f90
similarity index 100%
rename from test/Flang-Driver/predefined-macros-compiler-version.f90
rename to test/Driver/predefined-macros-compiler-version.f90
diff --git a/test/Flang-Driver/scanning-error.f95 b/test/Driver/scanning-error.f95
similarity index 100%
rename from test/Flang-Driver/scanning-error.f95
rename to test/Driver/scanning-error.f95
diff --git a/test/Flang-Driver/syntax-only.f90 b/test/Driver/syntax-only.f90
similarity index 100%
rename from test/Flang-Driver/syntax-only.f90
rename to test/Driver/syntax-only.f90
diff --git a/test/Flang-Driver/use-module-error.f90 b/test/Driver/use-module-error.f90
similarity index 100%
rename from test/Flang-Driver/use-module-error.f90
rename to test/Driver/use-module-error.f90
diff --git a/test/Flang-Driver/use-module.f90 b/test/Driver/use-module.f90
similarity index 100%
rename from test/Flang-Driver/use-module.f90
rename to test/Driver/use-module.f90
diff --git a/test/Driver/version-test.f90 b/test/Driver/version-test.f90
deleted file mode 100644
index 79be361..0000000
--- a/test/Driver/version-test.f90
+++ /dev/null
@@ -1,10 +0,0 @@
-! Check that lit configuration works by checking the compiler version
-
-! VERSION-NOT:{{![[:space:]]}}
-! VERSION:{{[[:space:]]}}
-! VERSION-SAME:f18 compiler (under development), version {{[1-9][0-9]*.[0-9]*.[0-9]*}}
-! VERSION-EMPTY:
-  
-! RUN: %f18 -V 2>&1 | FileCheck  -check-prefix=VERSION %s
-! RUN: %f18 -v 2>&1 | FileCheck  -check-prefix=VERSION %s
-! RUN: %f18 --version 2>&1 | FileCheck  -check-prefix=VERSION %s
diff --git a/test/Driver/write-module.f90 b/test/Driver/write-module.f90
index 47c37d6..baa480e 100644
--- a/test/Driver/write-module.f90
+++ b/test/Driver/write-module.f90
@@ -1,17 +1,28 @@
-! RUN: rm -rf %t && mkdir -p %t/mod-dir && cd %t && %f18 -fparse-only %s
-! RUN: ls %t/testmodule.mod && not ls %t/mod-dir/testmodule.mod
+! Checks that the module file:
+!   * is _saved_
+!   * is saved in the _directory specified by the user_
+! We use `-fsyntax-only` as it stops after the semantic checks (the module file is generated when sema checks are run)
 
-! RUN: rm -rf %t && mkdir -p %t/mod-dir && cd %t && %f18 -fparse-only -module mod-dir %s
-! RUN: ls %t/mod-dir/testmodule.mod && not ls %t/testmodule.mod
+!--------------------------
+! -module-dir
+!--------------------------
+! RUN: rm -rf %t && mkdir -p %t/dir-flang
+! RUN: cd %t && %flang -fsyntax-only -module-dir %t/dir-flang %s
+! RUN: ls %t/dir-flang/testmodule.mod && not ls %t/testmodule.mod
 
-! RUN: rm -rf %t && mkdir -p %t/mod-dir && cd %t && %f18 -fparse-only -module-dir mod-dir %s
-! RUN: ls %t/mod-dir/testmodule.mod && not ls %t/testmodule.mod
+!---------------------------
+! -J <dir> (i.e. with space)
+!---------------------------
+! RUN: rm -rf %t && mkdir -p %t/dir-flang
+! RUN: cd %t && %flang -fsyntax-only -J %t/dir-flang %s
+! RUN: ls %t/dir-flang/testmodule.mod && not ls %t/testmodule.mod
 
-! RUN: rm -rf %t && mkdir -p %t/mod-dir && cd %t && %f18 -fparse-only -J mod-dir %s
-! RUN: ls %t/mod-dir/testmodule.mod && not ls %t/testmodule.mod
-
-! RUN: rm -rf %t && mkdir -p %t/mod-dir && cd %t && %f18 -fparse-only -Jmod-dir %s
-! RUN: ls %t/mod-dir/testmodule.mod && not ls %t/testmodule.mod
+!------------------------------
+! -J<dir> (i.e. without space)
+!------------------------------
+! RUN: rm -rf %t && mkdir -p %t/dir-flang
+! RUN: cd %t && %flang -fsyntax-only -J%t/dir-flang %s
+! RUN: ls %t/dir-flang/testmodule.mod && not ls %t/testmodule.mod
 
 module testmodule
   type::t2
diff --git a/test/Flang-Driver/input-from-stdin.f90 b/test/Flang-Driver/input-from-stdin.f90
deleted file mode 100644
index d95218a..0000000
--- a/test/Flang-Driver/input-from-stdin.f90
+++ /dev/null
@@ -1,47 +0,0 @@
-! Verify that reading from stdin works as expected
-
-! REQUIRES: new-flang-driver
-
-!--------------------------
-! FLANG DRIVER (flang-new)
-!--------------------------
-! Input type is implicit
-! RUN: cat %s | flang-new -E - | FileCheck %s --check-prefix=PP-NOT-DEFINED
-! RUN: cat %s | flang-new -DNEW -E - | FileCheck %s --check-prefix=PP-DEFINED
-
-! Input type is explicit
-! RUN: cat %s | flang-new -E -x f95-cpp-input - | FileCheck %s --check-prefix=PP-NOT-DEFINED
-! RUN: cat %s | flang-new -DNEW -E -x f95-cpp-input - | FileCheck %s --check-prefix=PP-DEFINED
-
-!---------------------------------------
-! FLANG FRONTEND DRIVER (flang-new -fc1)
-!---------------------------------------
-! Test `-E`: for the corresponding frontend actions the driver relies on the prescanner API to handle file I/O
-! RUN: cat %s | flang-new -fc1 -E | FileCheck %s --check-prefix=PP-NOT-DEFINED
-! RUN: cat %s | flang-new -fc1 -DNEW -E | FileCheck %s --check-prefix=PP-DEFINED
-
-! Test `-test-io`: for the corresponding frontend action (`InputOutputTestAction`) the driver handles the file I/O on its own
-! the corresponding action (`PrintPreprocessedAction`)
-! RUN: cat %s | flang-new -fc1 -test-io | FileCheck %s --check-prefix=IO --match-full-lines
-! RUN: cat %s | flang-new -fc1 -DNEW -test-io | FileCheck %s --check-prefix=IO --match-full-lines
-
-!-------------------------
-! EXPECTED OUTPUT for `-E`
-!-------------------------
-! PP-NOT-DEFINED: program b
-! PP-DEFINED: program a
-
-!-------------------------------
-! EXPECTED OUTPUT for `-test-io`
-!-------------------------------
-! IO: #ifdef NEW
-! IO-NEXT:   Program A
-! IO-NEXT: #else
-! IO-NEXT:   Program B
-! IO-NEXT: #endif
-
-#ifdef NEW
-  Program A
-#else
-  Program B
-#endif
diff --git a/test/Flang-Driver/write-module.f90 b/test/Flang-Driver/write-module.f90
deleted file mode 100644
index 5065be9..0000000
--- a/test/Flang-Driver/write-module.f90
+++ /dev/null
@@ -1,16 +0,0 @@
-! RUN: rm -rf %t && mkdir -p %t/dir-flang
-! RUN: cd %t && %flang -fsyntax-only -module-dir %t/dir-flang %s
-! RUN: ls %t/dir-flang/testmodule.mod && not ls %t/testmodule.mod
-
-! RUN: rm -rf %t && mkdir -p %t/dir-flang
-! RUN: cd %t && %flang -fsyntax-only -J %t/dir-flang %s
-! RUN: ls %t/dir-flang/testmodule.mod && not ls %t/testmodule.mod
-
-! RUN: rm -rf %t && mkdir -p %t/dir-flang
-! RUN: cd %t && %flang -fsyntax-only -J%t/dir-flang %s
-! RUN: ls %t/dir-flang/testmodule.mod && not ls %t/testmodule.mod
-
-module testmodule
-  type::t2
-  end type
-end