diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index a6b3c224f..d4353f717 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -616,7 +616,7 @@ C_TEST_CASES += \
 	inctest \
 	infinity \
 	integers \
-	keyword_rename \
+	keyword_rename_c \
 	lextype \
 	li_carrays \
 	li_cdata \
diff --git a/Examples/test-suite/go/keyword_rename_c_runme.go b/Examples/test-suite/go/keyword_rename_c_runme.go
new file mode 100644
index 000000000..425e38a26
--- /dev/null
+++ b/Examples/test-suite/go/keyword_rename_c_runme.go
@@ -0,0 +1,8 @@
+package main
+
+import "./keyword_rename_c"
+
+func main() {
+	keyword_rename_c.Xgo(1)
+	keyword_rename_c.Xchan(1)
+}
diff --git a/Examples/test-suite/keyword_rename_c.i b/Examples/test-suite/keyword_rename_c.i
new file mode 100644
index 000000000..9c3294271
--- /dev/null
+++ b/Examples/test-suite/keyword_rename_c.i
@@ -0,0 +1,7 @@
+/*
+ * Test reserved keyword renaming
+ */
+
+%module keyword_rename_c
+
+%include "keyword_rename.i"
diff --git a/Examples/test-suite/lua/keyword_rename_c_runme.lua b/Examples/test-suite/lua/keyword_rename_c_runme.lua
new file mode 100644
index 000000000..ca4f73cf9
--- /dev/null
+++ b/Examples/test-suite/lua/keyword_rename_c_runme.lua
@@ -0,0 +1,12 @@
+require("import")	-- the import fn
+import("keyword_rename_c")	-- import lib into global
+kn=keyword_rename_c--alias
+
+-- catching undefined variables
+local env = _ENV -- Lua 5.2
+if not env then env = getfenv () end -- Lua 5.1
+setmetatable(env, {__index=function (t,i) error("undefined global variable `"..i.."'",2) end})
+
+-- Check renaming of Lua keywords
+assert(kn.c_end(5) == 5)
+assert(kn.c_nil(7) == 7)
diff --git a/Examples/test-suite/python/keyword_rename_c_runme.py b/Examples/test-suite/python/keyword_rename_c_runme.py
new file mode 100644
index 000000000..c17aede4c
--- /dev/null
+++ b/Examples/test-suite/python/keyword_rename_c_runme.py
@@ -0,0 +1,4 @@
+#!/usr/bin/env python
+import keyword_rename_c
+keyword_rename_c._in(1)
+keyword_rename_c._except(1)