diff --git a/test/blackbox-tests/dune.inc b/test/blackbox-tests/dune.inc
index 56093c94..89ee0193 100644
--- a/test/blackbox-tests/dune.inc
+++ b/test/blackbox-tests/dune.inc
@@ -88,6 +88,14 @@
    test-cases/depend-on-the-universe
    (progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected)))))
 
+(alias
+ (name dune-jbuild-var-case)
+ (deps (package dune) (source_tree test-cases/dune-jbuild-var-case))
+ (action
+  (chdir
+   test-cases/dune-jbuild-var-case
+   (progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected)))))
+
 (alias
  (name dune-ppx-driver-system)
  (deps (package dune) (source_tree test-cases/dune-ppx-driver-system))
@@ -641,6 +649,7 @@
   (alias cross-compilation)
   (alias custom-build-dir)
   (alias depend-on-the-universe)
+  (alias dune-jbuild-var-case)
   (alias dune-ppx-driver-system)
   (alias dune-project-edition)
   (alias env)
@@ -718,6 +727,7 @@
   (alias cross-compilation)
   (alias custom-build-dir)
   (alias depend-on-the-universe)
+  (alias dune-jbuild-var-case)
   (alias dune-ppx-driver-system)
   (alias dune-project-edition)
   (alias env)
diff --git a/test/blackbox-tests/test-cases/dune-jbuild-var-case/dune-lower/dune b/test/blackbox-tests/test-cases/dune-jbuild-var-case/dune-lower/dune
new file mode 100644
index 00000000..343bdb81
--- /dev/null
+++ b/test/blackbox-tests/test-cases/dune-jbuild-var-case/dune-lower/dune
@@ -0,0 +1,3 @@
+(alias
+ (name runtest)
+ (action (with-stdout-to %{null} (echo %{make}))))
\ No newline at end of file
diff --git a/test/blackbox-tests/test-cases/dune-jbuild-var-case/dune-lower/dune-project b/test/blackbox-tests/test-cases/dune-jbuild-var-case/dune-lower/dune-project
new file mode 100644
index 00000000..b2559fa0
--- /dev/null
+++ b/test/blackbox-tests/test-cases/dune-jbuild-var-case/dune-lower/dune-project
@@ -0,0 +1 @@
+(lang dune 1.0)
\ No newline at end of file
diff --git a/test/blackbox-tests/test-cases/dune-jbuild-var-case/dune-upper/dune b/test/blackbox-tests/test-cases/dune-jbuild-var-case/dune-upper/dune
new file mode 100644
index 00000000..f6be7174
--- /dev/null
+++ b/test/blackbox-tests/test-cases/dune-jbuild-var-case/dune-upper/dune
@@ -0,0 +1,3 @@
+(alias
+ (name runtest)
+ (action (with-stdout-to %{null} (echo %{MAKE}))))
\ No newline at end of file
diff --git a/test/blackbox-tests/test-cases/dune-jbuild-var-case/dune-upper/dune-project b/test/blackbox-tests/test-cases/dune-jbuild-var-case/dune-upper/dune-project
new file mode 100644
index 00000000..b2559fa0
--- /dev/null
+++ b/test/blackbox-tests/test-cases/dune-jbuild-var-case/dune-upper/dune-project
@@ -0,0 +1 @@
+(lang dune 1.0)
\ No newline at end of file
diff --git a/test/blackbox-tests/test-cases/dune-jbuild-var-case/jbuilder-lower/jbuild b/test/blackbox-tests/test-cases/dune-jbuild-var-case/jbuilder-lower/jbuild
new file mode 100644
index 00000000..04a36be2
--- /dev/null
+++ b/test/blackbox-tests/test-cases/dune-jbuild-var-case/jbuilder-lower/jbuild
@@ -0,0 +1,3 @@
+(alias
+ ((name runtest)
+  (action (with-stdout-to ${null} (echo ${make})))))
diff --git a/test/blackbox-tests/test-cases/dune-jbuild-var-case/jbuilder-upper/jbuild b/test/blackbox-tests/test-cases/dune-jbuild-var-case/jbuilder-upper/jbuild
new file mode 100644
index 00000000..7132e12f
--- /dev/null
+++ b/test/blackbox-tests/test-cases/dune-jbuild-var-case/jbuilder-upper/jbuild
@@ -0,0 +1,3 @@
+(alias
+ ((name runtest)
+  (action (with-stdout-to ${null} (echo ${MAKE})))))
diff --git a/test/blackbox-tests/test-cases/dune-jbuild-var-case/run.t b/test/blackbox-tests/test-cases/dune-jbuild-var-case/run.t
new file mode 100644
index 00000000..0c73c331
--- /dev/null
+++ b/test/blackbox-tests/test-cases/dune-jbuild-var-case/run.t
@@ -0,0 +1,18 @@
+All builtin variables are lower cased in Dune:
+
+  $ dune runtest --root dune-lower
+  Entering directory 'dune-lower'
+
+  $ dune runtest --root dune-upper
+  Entering directory 'dune-upper'
+  File "dune", line 3, characters 41-46:
+  Error: Uppercase variables are removed in dune files. Use: %{make}
+  [1]
+
+jbuilder retains the old names:
+
+  $ jbuilder runtest --root jbuilder-upper
+  Entering directory 'jbuilder-upper'
+
+  $ jbuilder runtest --root jbuilder-upper
+  Entering directory 'jbuilder-upper'