diff --git a/gson/src/test/java/com/google/gson/FieldNamingStrategy2AdapterTest.java b/gson/src/test/java/com/google/gson/FieldNamingStrategy2AdapterTest.java
new file mode 100644
index 00000000..f215a298
--- /dev/null
+++ b/gson/src/test/java/com/google/gson/FieldNamingStrategy2AdapterTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.gson;
+
+import java.lang.reflect.Field;
+
+import junit.framework.TestCase;
+
+/**
+ * Unit test for the {@link FieldNamingStrategy2Adapter} class.
+ *
+ * @author Inderjeet Singh
+ * @author Joel Leitch
+ */
+public class FieldNamingStrategy2AdapterTest extends TestCase {
+
+  public void testSimpleAdapter() throws Exception {
+    Field field = String.class.getFields()[0];
+    String expectedFieldName = field.getName().toUpperCase();
+    FieldNamingStrategy2 adapter =
+        new FieldNamingStrategy2Adapter(new UpperCaseNamingStrategy());
+    assertEquals(expectedFieldName, adapter.translateName(
+        new FieldAttributes(String.class, field)));
+  }
+  
+  private static class UpperCaseNamingStrategy implements FieldNamingStrategy {
+    public String translateName(Field f) {
+      return f.getName().toUpperCase();
+    }
+  }
+}
diff --git a/gson/src/test/java/com/google/gson/functional/NamingPolicyTest.java b/gson/src/test/java/com/google/gson/functional/NamingPolicyTest.java
index 5d28909e..39dc13df 100644
--- a/gson/src/test/java/com/google/gson/functional/NamingPolicyTest.java
+++ b/gson/src/test/java/com/google/gson/functional/NamingPolicyTest.java
@@ -15,7 +15,10 @@
  */
 package com.google.gson.functional;
 
+import java.lang.reflect.Field;
+
 import com.google.gson.FieldNamingPolicy;
+import com.google.gson.FieldNamingStrategy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.SerializedName;
@@ -109,6 +112,19 @@ public class NamingPolicyTest extends TestCase {
     actual = gson.toJson(target);
     assertEquals("{\"a\":3.0}", actual);
   }
+  
+  public void testDeprecatedNamingStrategy() throws Exception {
+    Gson gson = builder.setFieldNamingStrategy(new UpperCaseNamingStrategy()).create();
+    ClassWithDuplicateFields target = new ClassWithDuplicateFields(10);
+    String actual = gson.toJson(target);
+    assertEquals("{\"A\":10}", actual);
+  }
+
+  private static class UpperCaseNamingStrategy implements FieldNamingStrategy {
+    public String translateName(Field f) {
+      return f.getName().toUpperCase();
+    }
+  }
 
   @SuppressWarnings("unused")
   private static class ClassWithDuplicateFields {