diff --git a/src/dune/dune_file.ml b/src/dune/dune_file.ml
index 2f251a0d5f88..efd6f673d603 100644
--- a/src/dune/dune_file.ml
+++ b/src/dune/dune_file.ml
@@ -498,7 +498,8 @@ module Buildable = struct
         ( Dune_lang.Syntax.since Stanza.syntax (2, 0)
         >>> repeat (located string) )
     and+ c_flags =
-      Ordered_set_lang.Unexpanded.field "c_flags" ?check:(Some (use_foreign >>> check_c (return ())))
+      Ordered_set_lang.Unexpanded.field "c_flags"
+        ?check:(Some (use_foreign >>> check_c (return ())))
     and+ cxx_flags =
       Ordered_set_lang.Unexpanded.field "cxx_flags"
         ?check:(Some (use_foreign >>> check_c (return ())))
@@ -804,7 +805,8 @@ module Library = struct
            (repeat (located Lib_name.decode))
            ~default:[]
        and+ library_flags = Ordered_set_lang.Unexpanded.field "library_flags"
-       and+ c_library_flags = Ordered_set_lang.Unexpanded.field "c_library_flags"
+       and+ c_library_flags =
+         Ordered_set_lang.Unexpanded.field "c_library_flags"
        and+ virtual_deps =
          field "virtual_deps" (repeat (located Lib_name.decode)) ~default:[]
        and+ modes =
@@ -973,6 +975,7 @@ module Library = struct
       [ default_archive_name t ] )
     @ List.map ~f:snd t.buildable.foreign_archives
 
+  (* TODO_AM: Code duplication. *)
   let lib_files t ~dir ~ext_lib =
     List.map (archive_names t) ~f:(fun name ->
         Path.Build.relative dir (sprintf "lib%s%s" name ext_lib))
diff --git a/src/dune/dune_file.mli b/src/dune/dune_file.mli
index 063a5ae92226..40e81854e153 100644
--- a/src/dune/dune_file.mli
+++ b/src/dune/dune_file.mli
@@ -1,4 +1,4 @@
-(** Representation and parsing of dune files *)
+(** Representation and parsing of Dune files *)
 
 open! Stdune
 open Import
diff --git a/test/blackbox-tests/dune.inc b/test/blackbox-tests/dune.inc
index 5440a58e2b6b..81511dc3d429 100644
--- a/test/blackbox-tests/dune.inc
+++ b/test/blackbox-tests/dune.inc
@@ -594,6 +594,14 @@
    test-cases/foreign-library
    (progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected)))))
 
+(alias
+ (name foreign-stubs)
+ (deps (package dune) (source_tree test-cases/foreign-stubs))
+ (action
+  (chdir
+   test-cases/foreign-stubs
+   (progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected)))))
+
 (alias
  (name format-dune-file)
  (deps (package dune) (source_tree test-cases/format-dune-file))
@@ -642,14 +650,6 @@
    test-cases/github1231
    (progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected)))))
 
-(alias
- (name github1306)
- (deps (package dune) (source_tree test-cases/github1306))
- (action
-  (chdir
-   test-cases/github1306
-   (progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected)))))
-
 (alias
  (name github1342)
  (deps (package dune) (source_tree test-cases/github1342))
@@ -1910,13 +1910,13 @@
   (alias forbidden_libraries)
   (alias force-test)
   (alias foreign-library)
+  (alias foreign-stubs)
   (alias format-dune-file)
   (alias formatting)
   (alias gen-opam-install-file)
   (alias github1019)
   (alias github1099)
   (alias github1231)
-  (alias github1306)
   (alias github1342)
   (alias github1372)
   (alias github1395)
@@ -2127,12 +2127,12 @@
   (alias forbidden_libraries)
   (alias force-test)
   (alias foreign-library)
+  (alias foreign-stubs)
   (alias format-dune-file)
   (alias formatting)
   (alias github1019)
   (alias github1099)
   (alias github1231)
-  (alias github1306)
   (alias github1342)
   (alias github1395)
   (alias github1426)
diff --git a/test/blackbox-tests/test-cases/github1306/run.t b/test/blackbox-tests/test-cases/foreign-stubs/run.t
similarity index 100%
rename from test/blackbox-tests/test-cases/github1306/run.t
rename to test/blackbox-tests/test-cases/foreign-stubs/run.t