diff --git a/CHANGELOG b/CHANGELOG
index 968675756..19d8bbfcc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-2.8rc2 (2017-08-26)
+2.8.0 (2017-09-01)
 -------------------
 
 - #276: Remove easy_install from docs (TL;DR: use pip).
diff --git a/tests/test_config.py b/tests/test_config.py
index d6b444269..6a458dee5 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -344,6 +344,17 @@ def test_command_env_substitution_global(self, newconfig):
         envconfig = config.envconfigs['python']
         assert envconfig.commands == [["echo", "bar"]]
 
+    def test_reproduce_issue595(self, newconfig):
+        with pytest.raises(ValueError):
+            newconfig("""
+                [tox]
+                envlist = spam
+                [testenv]
+                setenv = DONTCARE = 0
+                [testenv:eggs]
+                setenv = {[testenv]setenv}
+            """)
+
 
 class TestIniParser:
     def test_getstring_single(self, tmpdir, newconfig):