diff --git a/jenkins_jobs/modules/project_matrix.py b/jenkins_jobs/modules/project_matrix.py
index 7f69a2a32..411d98785 100644
--- a/jenkins_jobs/modules/project_matrix.py
+++ b/jenkins_jobs/modules/project_matrix.py
@@ -46,6 +46,15 @@ Requires the Jenkins `dynamic axis Plugin.
             * **name** (`str`) -- name of the axis
             * **values** (`list`) -- values of the axis
 
+The module supports also ShiningPanda axes:
+
+Example::
+
+.. literalinclude::  /../../tests/general/fixtures/matrix-axis003.yaml
+
+Requires the Jenkins `ShiningPanda Plugin.
+<https://wiki.jenkins-ci.org/display/JENKINS/ShiningPanda+Plugin>`_
+
 Example::
 
  - job:
@@ -100,6 +109,7 @@ Example using user-defined axis::
          - sqlite
     builders:
      - shell: make "$database"
+
 """
 
 
@@ -116,6 +126,8 @@ class Matrix(jenkins_jobs.modules.base.Base):
         'user-defined': 'hudson.matrix.TextAxis',
         'slave': 'hudson.matrix.LabelAxis',
         'dynamic': 'ca.silvermaplesolutions.jenkins.plugins.daxis.DynamicAxis',
+        'python': 'jenkins.plugins.shiningpanda.matrix.PythonAxis',
+        'tox': 'jenkins.plugins.shiningpanda.matrix.ToxAxis',
     }
 
     def root_xml(self, data):
@@ -148,15 +160,21 @@ class Matrix(jenkins_jobs.modules.base.Base):
         ax_root = XML.SubElement(root, 'axes')
         for axis_ in data.get('axes', []):
             axis = axis_['axis']
-            if axis['type'] not in self.supported_axis:
+            axis_type = axis['type']
+            if axis_type not in self.supported_axis:
                 raise ValueError('Only %s axes types are supported'
                                  % self.supported_axis.keys())
-            axis_name = self.supported_axis.get(axis['type'])
+            axis_name = self.supported_axis.get(axis_type)
             lbl_root = XML.SubElement(ax_root, axis_name)
-            name, values = axis['name'], axis['values']
-            XML.SubElement(lbl_root, 'name').text = str(name)
+            name, values = axis.get('name', ''), axis.get('values', [''])
+            if axis_type == 'python':
+                XML.SubElement(lbl_root, 'name').text = 'PYTHON'
+            elif axis_type == 'tox':
+                XML.SubElement(lbl_root, 'name').text = 'TOXENV'
+            else:
+                XML.SubElement(lbl_root, 'name').text = str(name)
             v_root = XML.SubElement(lbl_root, 'values')
-            if axis['type'] == "dynamic":
+            if axis_type == "dynamic":
                 XML.SubElement(v_root, 'string').text = str(values[0])
                 XML.SubElement(lbl_root, 'varName').text = str(values[0])
                 v_root = XML.SubElement(lbl_root, 'axisValues')
diff --git a/tests/general/fixtures/matrix-axis003.xml b/tests/general/fixtures/matrix-axis003.xml
new file mode 100644
index 000000000..538337cc0
--- /dev/null
+++ b/tests/general/fixtures/matrix-axis003.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<matrix-project>
+  <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
+    <runSequentially>false</runSequentially>
+  </executionStrategy>
+  <combinationFilter/>
+  <axes>
+    <jenkins.plugins.shiningpanda.matrix.PythonAxis>
+      <name>PYTHON</name>
+      <values>
+        <string>python-2.6</string>
+        <string>python-2.7</string>
+        <string>python-3.4</string>
+      </values>
+    </jenkins.plugins.shiningpanda.matrix.PythonAxis>
+    <jenkins.plugins.shiningpanda.matrix.ToxAxis>
+      <name>TOXENV</name>
+      <values>
+        <string>py26</string>
+        <string>py27</string>
+        <string>py34</string>
+      </values>
+    </jenkins.plugins.shiningpanda.matrix.ToxAxis>
+  </axes>
+  <actions/>
+  <keepDependencies>false</keepDependencies>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <concurrentBuild>false</concurrentBuild>
+  <canRoam>true</canRoam>
+</matrix-project>
diff --git a/tests/general/fixtures/matrix-axis003.yaml b/tests/general/fixtures/matrix-axis003.yaml
new file mode 100644
index 000000000..4389e4495
--- /dev/null
+++ b/tests/general/fixtures/matrix-axis003.yaml
@@ -0,0 +1,15 @@
+name: matrix-test003
+project-type: matrix
+axes:
+    - axis:
+        type: python
+        values:
+        - python-2.6
+        - python-2.7
+        - python-3.4
+    - axis:
+        type: tox
+        values:
+        - py26
+        - py27
+        - py34