diff --git a/modello-maven-plugin/src/it/features/pom.xml b/modello-maven-plugin/src/it/features/pom.xml
index bad80fb9c..95c64076f 100644
--- a/modello-maven-plugin/src/it/features/pom.xml
+++ b/modello-maven-plugin/src/it/features/pom.xml
@@ -23,15 +23,15 @@
       <version>3.0.13</version>
     </dependency>
     <dependency>
-      <groupId>stax</groupId>
-      <artifactId>stax-api</artifactId>
-      <version>1.0.1</version>
+      <groupId>org.codehaus.woodstox</groupId>
+      <artifactId>stax2-api</artifactId>
+      <version>4.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.woodstox</groupId>
-      <artifactId>wstx-asl</artifactId>
-      <version>3.2.0</version>
+      <groupId>com.fasterxml.woodstox</groupId>
+      <artifactId>woodstox-core</artifactId>
+      <version>6.2.4</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/modello-maven-plugin/src/it/stax-no-plexus-utils/pom.xml b/modello-maven-plugin/src/it/stax-no-plexus-utils/pom.xml
index 93e7dbe19..0294425cd 100644
--- a/modello-maven-plugin/src/it/stax-no-plexus-utils/pom.xml
+++ b/modello-maven-plugin/src/it/stax-no-plexus-utils/pom.xml
@@ -16,15 +16,15 @@
   <dependencies>
     <!-- NOTE: This must compile without plexus-utils -->
     <dependency>
-      <groupId>stax</groupId>
-      <artifactId>stax-api</artifactId>
-      <version>1.0.1</version>
+      <groupId>org.codehaus.woodstox</groupId>
+      <artifactId>stax2-api</artifactId>
+      <version>4.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.woodstox</groupId>
-      <artifactId>wstx-asl</artifactId>
-      <version>3.2.0</version>
+      <groupId>com.fasterxml.woodstox</groupId>
+      <artifactId>woodstox-core</artifactId>
+      <version>6.2.4</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/modello-plugins/modello-plugin-converters/pom.xml b/modello-plugins/modello-plugin-converters/pom.xml
index 089b7a4ee..2e1ea6ed1 100644
--- a/modello-plugins/modello-plugin-converters/pom.xml
+++ b/modello-plugins/modello-plugin-converters/pom.xml
@@ -28,15 +28,15 @@
       <artifactId>plexus-utils</artifactId>
     </dependency>
     <dependency>
-      <groupId>stax</groupId>
-      <artifactId>stax-api</artifactId>
-      <version>1.0.1</version>
+      <groupId>org.codehaus.woodstox</groupId>
+      <artifactId>stax2-api</artifactId>
+      <version>4.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.woodstox</groupId>
-      <artifactId>wstx-asl</artifactId>
-      <version>3.2.0</version>
+      <groupId>com.fasterxml.woodstox</groupId>
+      <artifactId>woodstox-core</artifactId>
+      <version>6.2.4</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/modello-plugins/modello-plugin-converters/src/test/java/org/codehaus/modello/plugin/converters/ConverterGeneratorTest.java b/modello-plugins/modello-plugin-converters/src/test/java/org/codehaus/modello/plugin/converters/ConverterGeneratorTest.java
index b04e4bdb6..cab49175c 100644
--- a/modello-plugins/modello-plugin-converters/src/test/java/org/codehaus/modello/plugin/converters/ConverterGeneratorTest.java
+++ b/modello-plugins/modello-plugin-converters/src/test/java/org/codehaus/modello/plugin/converters/ConverterGeneratorTest.java
@@ -48,8 +48,8 @@ public void testConverterGenerator()
 
         generateConverterClasses( getXmlResourceReader( "/features.mdo" ), "1.0.0", "1.1.0" );
 
-        addDependency( "stax", "stax-api" );
-        addDependency( "org.codehaus.woodstox", "wstx-asl" );
+        addDependency( "org.codehaus.woodstox", "stax2-api" );
+        addDependency( "com.fasterxml.woodstox", "woodstox-core" );
 
         compileGeneratedSources();
 
diff --git a/modello-plugins/modello-plugin-stax/pom.xml b/modello-plugins/modello-plugin-stax/pom.xml
index 01ebd3f94..d978eb247 100644
--- a/modello-plugins/modello-plugin-stax/pom.xml
+++ b/modello-plugins/modello-plugin-stax/pom.xml
@@ -27,36 +27,16 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
-<!--
     <dependency>
-      <groupId>stax</groupId>
-      <artifactId>stax</artifactId>
-      <version>1.1.1-dev</version>
-      <exclusions>
-        <exclusion>
-          <groupId>xmlbeans</groupId>
-          <artifactId>xmlbeans-jsr173-api</artifactId>
-        </exclusion>
-      </exclusions>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>stax</groupId>
-      <artifactId>stax</artifactId>
-      <version>1.2.0</version>
-      <scope>test</scope>
-    </dependency>
--->
-    <dependency>
-      <groupId>stax</groupId>
-      <artifactId>stax-api</artifactId>
-      <version>1.0.1</version>
+      <groupId>org.codehaus.woodstox</groupId>
+      <artifactId>stax2-api</artifactId>
+      <version>4.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.woodstox</groupId>
-      <artifactId>wstx-asl</artifactId>
-      <version>3.2.0</version>
+      <groupId>com.fasterxml.woodstox</groupId>
+      <artifactId>woodstox-core</artifactId>
+      <version>6.2.4</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/AbstractStaxGeneratorTestCase.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/AbstractStaxGeneratorTestCase.java
index 23dbc1fca..b7ef4f189 100644
--- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/AbstractStaxGeneratorTestCase.java
+++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/AbstractStaxGeneratorTestCase.java
@@ -78,8 +78,8 @@ protected void verifyModel( Model model, String className, String[] versions )
             }
         }
 
-        addDependency( "stax", "stax-api" );
-        addDependency( "org.codehaus.woodstox", "wstx-asl" );
+        addDependency( "org.codehaus.woodstox", "stax2-api" );
+        addDependency( "com.fasterxml.woodstox", "woodstox-core" );
 
         compileGeneratedSources();
 
diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxDomGeneratorTest.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxDomGeneratorTest.java
index 27e5d5024..361d02f51 100644
--- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxDomGeneratorTest.java
+++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxDomGeneratorTest.java
@@ -53,8 +53,8 @@ public void testJavaGenerator()
         modello.generate( model, "stax-writer", parameters );
         modello.generate( model, "stax-reader", parameters );
 
-        addDependency( "stax", "stax-api" );
-        addDependency( "org.codehaus.woodstox", "wstx-asl" );
+        addDependency( "org.codehaus.woodstox", "stax2-api" );
+        addDependency( "com.fasterxml.woodstox", "woodstox-core" );
         addDependency( "org.xmlunit", "xmlunit-core" );
 
         compileGeneratedSources( 5 );
diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxGeneratorTest.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxGeneratorTest.java
index 52af968d6..2dbf1780d 100644
--- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxGeneratorTest.java
+++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/FeaturesStaxGeneratorTest.java
@@ -52,8 +52,8 @@ public void testJavaGenerator()
         modello.generate( model, "stax-writer", parameters );
         modello.generate( model, "stax-reader", parameters );
 
-        addDependency( "stax", "stax-api" );
-        addDependency( "org.codehaus.woodstox", "wstx-asl" );
+        addDependency( "org.codehaus.woodstox", "stax2-api" );
+        addDependency( "com.fasterxml.woodstox", "woodstox-core" );
         addDependency( "org.xmlunit", "xmlunit-core" );
 
         compileGeneratedSources( 5 );