diff --git a/src/pl/plpython/expected/README b/src/pl/plpython/expected/README
index 27c995db9a..65e8969e86 100644
--- a/src/pl/plpython/expected/README
+++ b/src/pl/plpython/expected/README
@@ -2,9 +2,11 @@ Guide to alternative expected files:
 
 plpython_error_0.out		Python 2.4 and older
 
-plpython_unicode.out		any version, when server encoding != SQL_ASCII and client encoding = UTF8; else ...
-plpython_unicode_0.out		any version, when server encoding != SQL_ASCII and client encoding != UTF8; else ...
-plpython_unicode_2.out		Python 2.2
-plpython_unicode_3.out		Python 2.3 through 3.1
+plpython_unicode.out		server encoding != SQL_ASCII and client encoding == UTF8; else ...
+plpython_unicode_0.out		server encoding != SQL_ASCII and client encoding != UTF8; else ...
+plpython_unicode_3.out		server encoding == SQL_ASCII
 
-plpython_types_3.out		Python 3.1
+plpython_types_3.out		Python 3.x
+
+Note: Building with Python 2.2 is supported, but there are no expected
+files for it (too much work to maintain).
diff --git a/src/pl/plpython/expected/plpython_unicode_2.out b/src/pl/plpython/expected/plpython_unicode_2.out
deleted file mode 100644
index d4f9a5d2fa..0000000000
--- a/src/pl/plpython/expected/plpython_unicode_2.out
+++ /dev/null
@@ -1,52 +0,0 @@
---
--- Unicode handling
---
-CREATE TABLE unicode_test (
-	testvalue  text NOT NULL
-);
-CREATE FUNCTION unicode_return() RETURNS text AS E'
-return u"\\x80"
-' LANGUAGE plpythonu;
-CREATE FUNCTION unicode_trigger() RETURNS trigger AS E'
-TD["new"]["testvalue"] = u"\\x80"
-return "MODIFY"
-' LANGUAGE plpythonu;
-CREATE TRIGGER unicode_test_bi BEFORE INSERT ON unicode_test
-  FOR EACH ROW EXECUTE PROCEDURE unicode_trigger();
-CREATE FUNCTION unicode_plan1() RETURNS text AS E'
-plan = plpy.prepare("SELECT $1 AS testvalue", ["text"])
-rv = plpy.execute(plan, [u"\\x80"], 1)
-return rv[0]["testvalue"]
-' LANGUAGE plpythonu;
-CREATE FUNCTION unicode_plan2() RETURNS text AS E'
-plan = plpy.prepare("SELECT $1 || $2 AS testvalue", ["text", u"text"])
-rv = plpy.execute(plan, ["foo", "bar"], 1)
-return rv[0]["testvalue"]
-' LANGUAGE plpythonu;
-SELECT unicode_return();
-ERROR:  could not convert Python Unicode object to PostgreSQL server encoding
-DETAIL:  UnicodeError: ASCII encoding error: ordinal not in range(128)
-CONTEXT:  while creating return value
-PL/Python function "unicode_return"
-INSERT INTO unicode_test (testvalue) VALUES ('test');
-ERROR:  could not convert Python Unicode object to PostgreSQL server encoding
-DETAIL:  UnicodeError: ASCII encoding error: ordinal not in range(128)
-CONTEXT:  while modifying trigger row
-PL/Python function "unicode_trigger"
-SELECT * FROM unicode_test;
- testvalue 
------------
-(0 rows)
-
-SELECT unicode_plan1();
-WARNING:  plpy.SPIError: unrecognized error in PLy_spi_execute_plan
-CONTEXT:  PL/Python function "unicode_plan1"
-ERROR:  plpy.SPIError: could not convert Python Unicode object to PostgreSQL server encoding
-DETAIL:  UnicodeError: ASCII encoding error: ordinal not in range(128)
-CONTEXT:  PL/Python function "unicode_plan1"
-SELECT unicode_plan2();
- unicode_plan2 
----------------
- foobar
-(1 row)
-