diff --git a/data/inputs/gri30.cti b/data/inputs/gri30.cti
index 7520b6ffb..4a49e2b6f 100644
--- a/data/inputs/gri30.cti
+++ b/data/inputs/gri30.cti
@@ -16,7 +16,6 @@ ideal_gas(name = "gri30",
                    HCN  H2CN  HCNN  HCNO  HOCN  HNCO  NCO  N2  AR  C3H7 
                    C3H8  CH2CHO  CH3CHO """,
       reactions = "all",
-      kinetics = "GRI30",
       initial_state = state(temperature = 300.0,
                         pressure = OneAtm)    )
 
@@ -29,7 +28,6 @@ ideal_gas(name = "gri30_mix",
                    HCN  H2CN  HCNN  HCNO  HOCN  HNCO  NCO  N2  AR  C3H7 
                    C3H8  CH2CHO  CH3CHO """,
       reactions = "all",
-      kinetics = "GRI30",
       transport = "Mix",
       initial_state = state(temperature = 300.0,
                         pressure = OneAtm)    )
@@ -44,7 +42,6 @@ ideal_gas(name = "gri30_multi",
                    HCN  H2CN  HCNN  HCNO  HOCN  HNCO  NCO  N2  AR  C3H7 
                    C3H8  CH2CHO  CH3CHO """,
       reactions = "all",
-      kinetics = "GRI30",
       transport = "Multi",
       initial_state = state(temperature = 300.0,
                         pressure = OneAtm)    )
diff --git a/data/inputs/gri30.xml b/data/inputs/gri30.xml
index 49e95139e..98d44aeb3 100644
--- a/data/inputs/gri30.xml
+++ b/data/inputs/gri30.xml
@@ -18,7 +18,7 @@
       <pressure units="Pa">101325.0</pressure>
     </state>
     <thermo model="IdealGas"/>
-    <kinetics model="GRI30"/>
+    <kinetics model="GasKinetics"/>
     <transport model="None"/>
   </phase>
 
@@ -38,7 +38,7 @@
       <pressure units="Pa">101325.0</pressure>
     </state>
     <thermo model="IdealGas"/>
-    <kinetics model="GRI30"/>
+    <kinetics model="GasKinetics"/>
     <transport model="Mix"/>
   </phase>
 
@@ -58,7 +58,7 @@
       <pressure units="Pa">101325.0</pressure>
     </state>
     <thermo model="IdealGas"/>
-    <kinetics model="GRI30"/>
+    <kinetics model="GasKinetics"/>
     <transport model="Multi"/>
   </phase>
 
diff --git a/data/inputs/gri30_highT.cti b/data/inputs/gri30_highT.cti
index f28dce35e..fe220d2b1 100644
--- a/data/inputs/gri30_highT.cti
+++ b/data/inputs/gri30_highT.cti
@@ -16,7 +16,7 @@ ideal_gas(name = "gri30",
                    HCN  H2CN  HCNN  HCNO  HOCN  HNCO  NCO  N2  AR  C3H7 
                    C3H8  CH2CHO  CH3CHO """,
       reactions = "all",
-      kinetics = "GRI30",
+#      kinetics = "GRI30",
       initial_state = state(temperature = 300.0,
                         pressure = OneAtm)    )
 
@@ -29,7 +29,7 @@ ideal_gas(name = "gri30_mix",
                    HCN  H2CN  HCNN  HCNO  HOCN  HNCO  NCO  N2  AR  C3H7 
                    C3H8  CH2CHO  CH3CHO """,
       reactions = "all",
-      kinetics = "GRI30",
+#      kinetics = "GRI30",
       transport = "Mix",
       initial_state = state(temperature = 300.0,
                         pressure = OneAtm)    )
@@ -44,7 +44,7 @@ ideal_gas(name = "gri30_multi",
                    HCN  H2CN  HCNN  HCNO  HOCN  HNCO  NCO  N2  AR  C3H7 
                    C3H8  CH2CHO  CH3CHO """,
       reactions = "all",
-      kinetics = "GRI30",
+#      kinetics = "GRI30",
       transport = "Multi",
       initial_state = state(temperature = 300.0,
                         pressure = OneAtm)    )
diff --git a/include/cantera/GRI30.h b/include/cantera/GRI30.h
index 36d8fea2b..a22a05585 100644
--- a/include/cantera/GRI30.h
+++ b/include/cantera/GRI30.h
@@ -18,6 +18,7 @@ namespace Cantera
  * class GRI_30_Kinetics, which is the kinetics manager with
  * hard-wired replacements for some of the generic kinetics
  * methods like "getNetReactionRates."
+ * @deprecated
  */
 class GRI30 :
     public IdealGasPhase,
diff --git a/include/cantera/kinetics/GRI_30_Kinetics.h b/include/cantera/kinetics/GRI_30_Kinetics.h
index 5a20b5df7..7ff9d3658 100644
--- a/include/cantera/kinetics/GRI_30_Kinetics.h
+++ b/include/cantera/kinetics/GRI_30_Kinetics.h
@@ -17,6 +17,7 @@ const int cGRI_30_Kinetics = cGasKinetics + 1;
 
 /**
  *  Kinetics manager implementing reaction mechanism GRI-Mech 3.0
+ *  @deprecated
  */
 class GRI_30_Kinetics : public GasKinetics
 {
diff --git a/interfaces/cython/cantera/test/test_reactor.py b/interfaces/cython/cantera/test/test_reactor.py
index 84ea288b6..030f83dcf 100644
--- a/interfaces/cython/cantera/test/test_reactor.py
+++ b/interfaces/cython/cantera/test/test_reactor.py
@@ -540,7 +540,7 @@ class TestWellStirredReactorIgnition(utilities.CanteraTest):
                 break
 
         # regression test; no external basis for this result
-        self.assertNear(tIg, 2.2284, 1e-3)
+        self.assertNear(tIg, 2.2249, 1e-3)
 
     def test_ignition2(self):
         self.setup(900.0, 10*ct.one_atm, 1.0, 20.0)
@@ -553,7 +553,7 @@ class TestWellStirredReactorIgnition(utilities.CanteraTest):
                 break
 
         # regression test; no external basis for this result
-        self.assertNear(tIg, 1.4900, 1e-3)
+        self.assertNear(tIg, 1.4856, 1e-3)
 
     def test_ignition3(self):
         self.setup(900.0, 10*ct.one_atm, 1.0, 80.0)
diff --git a/src/kinetics/GRI_30_Kinetics.cpp b/src/kinetics/GRI_30_Kinetics.cpp
index c6f420e7e..4d465352d 100644
--- a/src/kinetics/GRI_30_Kinetics.cpp
+++ b/src/kinetics/GRI_30_Kinetics.cpp
@@ -21,7 +21,10 @@ namespace Cantera
 {
 
 GRI_30_Kinetics::
-GRI_30_Kinetics(thermo_t* th) : GasKinetics(th) {}
+GRI_30_Kinetics(thermo_t* th) : GasKinetics(th) {
+    warn_deprecated("class GRI_30_Kinetics",
+                    "To be removed in Cantera 2.2.");
+}
 
 void GRI_30_Kinetics::
 gri30_update_rates_T()
diff --git a/test_problems/NASA9poly_test/gasNASA9.xml b/test_problems/NASA9poly_test/gasNASA9.xml
index 9988144c7..1187d9f65 100644
--- a/test_problems/NASA9poly_test/gasNASA9.xml
+++ b/test_problems/NASA9poly_test/gasNASA9.xml
@@ -19,7 +19,7 @@
       <pressure units="Pa">101325.0</pressure>
     </state>
     <thermo model="IdealGas"/>
-    <kinetics model="GRI30"/>
+    <kinetics model="GasKinetics"/>
     <transport model="Mix"/>
   </phase>
 
diff --git a/test_problems/cxx_ex/kinetics_example2.cpp b/test_problems/cxx_ex/kinetics_example2.cpp
index b58a0f717..877b4cee0 100644
--- a/test_problems/cxx_ex/kinetics_example2.cpp
+++ b/test_problems/cxx_ex/kinetics_example2.cpp
@@ -21,6 +21,7 @@ using namespace Cantera;
 
 int kinetics_example2(int job)
 {
+    suppress_deprecation_warnings();
     try {
         std::cout << "Ignition simulation using class GRI30." << std::endl;