diff --git a/Tests/Fortran/CMakeLists.txt b/Tests/Fortran/CMakeLists.txt
index adcadd4dc..3e890c877 100644
--- a/Tests/Fortran/CMakeLists.txt
+++ b/Tests/Fortran/CMakeLists.txt
@@ -7,8 +7,11 @@ message("CMAKE_Fortran_COMPILER_INIT = ${CMAKE_Fortran_COMPILER_INIT}")
 message("CMAKE_Fortran_COMPILER_FULLPATH = ${CMAKE_Fortran_COMPILER_FULLPATH}")
 message("CMAKE_Fortran_COMPILER = ${CMAKE_Fortran_COMPILER}")
 message("CMAKE_Fortran_FLAGS = ${CMAKE_Fortran_FLAGS}")
-add_executable(testf hello.f)
 
+add_library(hello STATIC hello.f)
+add_library(world SHARED world.f)
+add_executable(testf testf.f)
+target_link_libraries(testf hello world)
 
 function(test_fortran_c_interface_module)
   message(STATUS "Testing FortranCInterface module")
diff --git a/Tests/Fortran/hello.f b/Tests/Fortran/hello.f
index c9ee3c2cb..aa0de7715 100644
--- a/Tests/Fortran/hello.f
+++ b/Tests/Fortran/hello.f
@@ -1,6 +1,6 @@
-	PROGRAM GREETINGS
+	SUBROUTINE HELLO
 
-	PRINT *, 'Real programmers write Fortran!'
+	PRINT *, 'Hello'
 
 	END
 
diff --git a/Tests/Fortran/testf.f b/Tests/Fortran/testf.f
new file mode 100644
index 000000000..abf6c6df7
--- /dev/null
+++ b/Tests/Fortran/testf.f
@@ -0,0 +1,7 @@
+	PROGRAM TESTF
+
+	CALL HELLO()
+	CALL WORLD()
+
+	END
+
diff --git a/Tests/Fortran/world.f b/Tests/Fortran/world.f
new file mode 100644
index 000000000..0487dffe4
--- /dev/null
+++ b/Tests/Fortran/world.f
@@ -0,0 +1,6 @@
+	SUBROUTINE WORLD
+
+	PRINT *, 'World!'
+
+	END
+