diff --git a/CHANGELOG b/CHANGELOG
index c3c1b2ab4..a3de136ee 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -51,6 +51,8 @@ Bug fixes / Maintenance
 - fix terminal writing on win32/python2.4 
 - py.process.cmdexec() now tries harder to return properly encoded unicode objects 
   on all python versions
+- install plain py.test/py.which scripts also for Jython, this helps to
+  get canonical script paths in virtualenv situations
 
 Changes between 1.3.0 and 1.3.1
 ==================================================
diff --git a/bin-for-dist/test_install.py b/bin-for-dist/test_install.py
index 17afdb92c..a9c79128e 100644
--- a/bin-for-dist/test_install.py
+++ b/bin-for-dist/test_install.py
@@ -166,7 +166,7 @@ def test_cmdline_entrypoints(monkeypatch):
         expected = "%s-jython" % script
         assert expected in points
     for script in unversioned_scripts:
-        assert script not in points
+        assert script in points
 
     points = cmdline_entrypoints((2,5,1), "xyz", 'pypy-c-XYZ')
     for script in versioned_scripts:
diff --git a/setup.py b/setup.py
index ff0112821..ba47215d9 100644
--- a/setup.py
+++ b/setup.py
@@ -71,9 +71,9 @@ def cmdline_entrypoints(versioninfo, platform, basename):
               'py.test-%s.%s' % versioninfo[:2] : 'py.cmdline:pytest',
               'py.which-%s.%s' % versioninfo[:2] : 'py.cmdline:pywhich'
             }
-        for x in ['py.cleanup', 'py.convert_unittest', 'py.countloc', 
-                  'py.lookup', 'py.svnwcrevert', 'py.which', 'py.test']:
-            points[x] = "py.cmdline:%s" % x.replace('.','')
+    for x in ['py.cleanup', 'py.convert_unittest', 'py.countloc', 
+              'py.lookup', 'py.svnwcrevert', 'py.which', 'py.test']:
+        points[x] = "py.cmdline:%s" % x.replace('.','')
     return points
 
 def make_entry_points():