diff --git a/_pytest/genscript.py b/_pytest/genscript.py
index f41230b8a..22f3fdeae 100755
--- a/_pytest/genscript.py
+++ b/_pytest/genscript.py
@@ -72,11 +72,11 @@ def pytest_cmdline_main(config):
         deps =  ['py', '_pytest', 'pytest']
         if sys.version_info < (2,7):
             deps.append("argparse")
-            tw.line("generated script will run on python2.5-python3.3++")
+            tw.line("generated script will run on python2.6-python3.3++")
         else:
             tw.line("WARNING: generated script will not run on python2.6 "
-                    "or below due to 'argparse' dependency. Use python2.6 "
-                    "to generate a python2.5/6 compatible script", red=True)
+                    "due to 'argparse' dependency. Use python2.6 "
+                    "to generate a python2.6 compatible script", red=True)
         script = generate_script(
             'import pytest; raise SystemExit(pytest.cmdline.main())',
             deps,
diff --git a/doc/en/example/multipython.py b/doc/en/example/multipython.py
index 0e2175a1e..2c7cac6a1 100644
--- a/doc/en/example/multipython.py
+++ b/doc/en/example/multipython.py
@@ -5,7 +5,7 @@ serialization via the pickle module.
 import py
 import pytest
 
-pythonlist = ['python2.4', 'python2.5', 'python2.6', 'python2.7', 'python2.8']
+pythonlist = ['python2.6', 'python2.7', 'python3.4']
 @pytest.fixture(params=pythonlist)
 def python1(request, tmpdir):
     picklefile = tmpdir.join("data.pickle")
diff --git a/testing/conftest.py b/testing/conftest.py
index 4e048ed96..3e905957a 100644
--- a/testing/conftest.py
+++ b/testing/conftest.py
@@ -77,12 +77,11 @@ def pytest_runtest_teardown(item, __multicall__):
 winpymap = {
     'python2.7': r'C:\Python27\python.exe',
     'python2.6': r'C:\Python26\python.exe',
-    'python2.5': r'C:\Python25\python.exe',
-    'python2.4': r'C:\Python24\python.exe',
     'python3.1': r'C:\Python31\python.exe',
     'python3.2': r'C:\Python32\python.exe',
     'python3.3': r'C:\Python33\python.exe',
     'python3.4': r'C:\Python34\python.exe',
+    'python3.5': r'C:\Python35\python.exe',
 }
 
 def getexecutable(name, cache={}):
@@ -103,9 +102,8 @@ def getexecutable(name, cache={}):
         cache[name] = executable
         return executable
 
-@pytest.fixture(params=['python2.5', 'python2.6',
-                        'python2.7', 'python3.2', "python3.3",
-                        'pypy', 'jython'])
+@pytest.fixture(params=['python2.6', 'python2.7', 'python3.3', "python3.4",
+                        'pypy', 'pypy3', 'jython'])
 def anypython(request):
     name = request.param
     executable = getexecutable(name)