diff --git a/SWIG/Examples/test-suite/lib_std_string.i b/SWIG/Examples/test-suite/lib_std_string.i
index 37af9e4f2..8c2c39be5 100644
--- a/SWIG/Examples/test-suite/lib_std_string.i
+++ b/SWIG/Examples/test-suite/lib_std_string.i
@@ -3,23 +3,35 @@
 
 %inline %{
 
-std::string test_value_in(std::string x) {
+std::string test_value(std::string x) {
    return x;
 }
 
-std::string *test_pointer_in(std::string *x) {
+const std::string& test_const_reference(const std::string &x) {
    return x;
 }
 
-const std::string *test_const_pointer_in(const std::string *x) {
-   return x;
+void test_pointer(std::string *x) {
 }
 
-std::string test_reference_in(std::string &x) {
-   return x;
+std::string *test_pointer_out() {
+   static std::string x = "x";
+   return &x;
 }
 
-std::string test_const_reference_in(const std::string &x) {
+void test_const_pointer(const std::string *x) {
+}
+
+const std::string *test_const_pointer_out() {
+   static std::string x = "x";
+   return &x;
+}
+
+void test_reference(std::string &x) {
+}
+
+std::string& test_reference_out() {
+   static std::string x = "x";
    return x;
 }
 
diff --git a/SWIG/Examples/test-suite/ruby/lib_std_string_runme.rb b/SWIG/Examples/test-suite/ruby/lib_std_string_runme.rb
index c691242d8..dbf96810c 100644
--- a/SWIG/Examples/test-suite/ruby/lib_std_string_runme.rb
+++ b/SWIG/Examples/test-suite/ruby/lib_std_string_runme.rb
@@ -3,15 +3,15 @@ require 'lib_std_string'
 include Lib_std_string
 
 # Checking expected use of %typemap(in) std::string {}
-test_value_in("Fee")
+test_value("Fee")
 
 # Checking expected result of %typemap(out) std::string {}
-raise RuntimeError unless test_value_in("Fi") == "Fi"
+raise RuntimeError unless test_value("Fi") == "Fi"
 
 # Verify type-checking for %typemap(in) std::string {}
 exceptionRaised = false
 begin
-  test_value_in(0)
+  test_value(0)
 rescue TypeError
   exceptionRaised = true
 ensure
@@ -19,15 +19,60 @@ ensure
 end
 
 # Checking expected use of %typemap(in) const std::string & {}
-test_const_reference_in("Fo")
+test_const_reference("Fo")
+
+# Checking expected result of %typemap(out) const std::string& {}
+raise RuntimeError unless test_const_reference("Fum") == "Fum"
 
 # Verify type-checking for %typemap(in) const std::string & {}
 exceptionRaised = false
 begin
-  test_const_reference_in(0)
+  test_const_reference(0)
 rescue TypeError
   exceptionRaised = true
 ensure
   raise RuntimeError unless exceptionRaised
 end
 
+#
+# Input and output typemaps for pointers and non-const references to
+# std::string are *not* supported; the following tests confirm
+# that none of these cases are slipping through.
+#
+
+exceptionRaised = false
+begin
+  test_pointer("foo")
+rescue TypeError
+  exceptionRaised = true
+ensure
+  raise RuntimeError unless exceptionRaised
+end
+
+result = test_pointer_out()
+raise RuntimeError if result.is_a? String
+
+exceptionRaised = false
+begin
+  test_const_pointer("bar")
+rescue TypeError
+  exceptionRaised = true
+ensure
+  raise RuntimeError unless exceptionRaised
+end
+
+result = test_const_pointer_out()
+raise RuntimeError if result.is_a? String
+
+exceptionRaised = false
+begin
+  test_reference("foo")
+rescue TypeError
+  exceptionRaised = true
+ensure
+  raise RuntimeError unless exceptionRaised
+end
+
+result = test_reference_out()
+raise RuntimeError if result.is_a? String
+