diff --git a/Tests/Fortran/CMakeLists.txt b/Tests/Fortran/CMakeLists.txt
index c6c6689171..a8b861cc93 100644
--- a/Tests/Fortran/CMakeLists.txt
+++ b/Tests/Fortran/CMakeLists.txt
@@ -22,4 +22,5 @@ IF(CMAKE_Fortran_COMPILER_SUPPORTS_F90)
     in_interface/main.f90
     in_interface/module.f90)
 
+  ADD_SUBDIRECTORY(Library)
 ENDIF(CMAKE_Fortran_COMPILER_SUPPORTS_F90)
diff --git a/Tests/Fortran/Library/CMakeLists.txt b/Tests/Fortran/Library/CMakeLists.txt
new file mode 100644
index 0000000000..8d6290004b
--- /dev/null
+++ b/Tests/Fortran/Library/CMakeLists.txt
@@ -0,0 +1,3 @@
+ADD_LIBRARY(subdir_mods a.f90 b.f90)
+ADD_EXECUTABLE(subdir_exe main.f90)
+TARGET_LINK_LIBRARIES(subdir_exe subdir_mods)
diff --git a/Tests/Fortran/Library/a.f90 b/Tests/Fortran/Library/a.f90
new file mode 100644
index 0000000000..3031c07237
--- /dev/null
+++ b/Tests/Fortran/Library/a.f90
@@ -0,0 +1,3 @@
+MODULE libraryModuleA
+        USE libraryModuleB
+END MODULE
diff --git a/Tests/Fortran/Library/b.f90 b/Tests/Fortran/Library/b.f90
new file mode 100644
index 0000000000..ae1edcb20d
--- /dev/null
+++ b/Tests/Fortran/Library/b.f90
@@ -0,0 +1,2 @@
+MODULE libraryModuleB
+END MODULE
diff --git a/Tests/Fortran/Library/main.f90 b/Tests/Fortran/Library/main.f90
new file mode 100644
index 0000000000..2385408a28
--- /dev/null
+++ b/Tests/Fortran/Library/main.f90
@@ -0,0 +1,3 @@
+PROGRAM MAINF90
+  USE libraryModuleA
+END PROGRAM MAINF90