diff --git a/qctrlopencontrols/qiskit/__init__.py b/qctrlopencontrols/qiskit/__init__.py
index 062224f0..5c968758 100644
--- a/qctrlopencontrols/qiskit/__init__.py
+++ b/qctrlopencontrols/qiskit/__init__.py
@@ -18,5 +18,6 @@
 =============
 """
 
-from .constants import (FIX_DURATION_UNITARY, INSTANT_UNITARY)
+from .constants import (FIX_DURATION_UNITARY, INSTANT_UNITARY,
+                        DEFAULT_PRE_POST_GATE_PARAMETERS)
 from .quantum_circuit import convert_dds_to_quantum_circuit
diff --git a/qctrlopencontrols/qiskit/constants.py b/qctrlopencontrols/qiskit/constants.py
index ee1cb269..91618fcd 100644
--- a/qctrlopencontrols/qiskit/constants.py
+++ b/qctrlopencontrols/qiskit/constants.py
@@ -18,6 +18,8 @@
 ================
 """
 
+import numpy as np
+
 FIX_DURATION_UNITARY = 'fixed duration unitary'
 """Algorithm to convert a DDS to Quantum circuit
 where the unitaries are considered as gates with finite duration
@@ -27,3 +29,7 @@
 """Algorithm to convert a DDS to Quantum circuit where the
 unitaties are considered as instantaneous operation.
 """
+
+DEFAULT_PRE_POST_GATE_PARAMETERS = (np.pi / 2, -np.pi / 2, np.pi / 2)
+"""Parameters of a default U3 gate for pre-post rotation for circuits.
+"""
diff --git a/qctrlopencontrols/qiskit/quantum_circuit.py b/qctrlopencontrols/qiskit/quantum_circuit.py
index 548b12c1..0b0c6e32 100644
--- a/qctrlopencontrols/qiskit/quantum_circuit.py
+++ b/qctrlopencontrols/qiskit/quantum_circuit.py
@@ -27,7 +27,8 @@
 from qctrlopencontrols.dynamic_decoupling_sequences import DynamicDecouplingSequence
 from qctrlopencontrols.exceptions import ArgumentsValueError
 
-from .constants import (FIX_DURATION_UNITARY, INSTANT_UNITARY)
+from .constants import (FIX_DURATION_UNITARY, INSTANT_UNITARY,
+                        DEFAULT_PRE_POST_GATE_PARAMETERS)
 
 
 def _get_circuit_gate_list(dynamic_decoupling_sequence,
@@ -131,7 +132,7 @@ def convert_dds_to_quantum_circuit(
         dynamic_decoupling_sequence,
         target_qubits=None,
         gate_time=0.1,
-        pre_post_gate_parameters=None,
+        pre_post_gate_parameters=DEFAULT_PRE_POST_GATE_PARAMETERS,
         add_measurement=True,
         algorithm=FIX_DURATION_UNITARY,
         quantum_registers=None,
@@ -148,13 +149,14 @@ def convert_dds_to_quantum_circuit(
         defaults to None
     gate_time : float, optional
         Time (in seconds) delay introduced by a gate; defaults to 0.1
-    pre_post_gate_parameters : list, optional
-        List of (length 3) floating point numbers; These numbers correspond to :math:`\\theta,
-        \\phi, \\lambda` parameters in `U3` gate defined in Qiskit as `U3Gate(theta, phi, lamda)`.
-        Qiskit documentation suggests this to be the most generalized definition of unitary
-        gates. Defaults to None; if None, the parameters are assumed to be
-        :math:`[pi/2, -pi/2, pi/2]` that corresponds to `pi/2` rotation around X-axis.
-        See `IBM-Q Documentation
+    pre_post_gate_parameters : tuple or None, optional
+        Tuple of (length 3) floating point numbers that correspond to :math:`\\theta,
+        \\phi, \\lambda` parameters respectively in `U3` gate defined in Qiskit
+        as `U3Gate(theta, phi, lambda)`. Qiskit documentation suggests this to be
+        the most generalized definition of unitary gates. Defaults to
+        (pi/2, -pi/2, pi/2) that corresponds to a :math:`pi/2`
+        rotation around X-axis; if None, the resulting circuit will have no `pre` or `post`
+        gates. See `IBM-Q Documentation
         <https://quantumexperience.ng.bluemix.net/proxy/tutorial/full-user-guide/
         002-The_Weird_and_Wonderful_World_of_the_Qubit/004-advanced_qubit_gates.html?` _.
     add_measurement : bool, optional
@@ -217,10 +219,8 @@ def convert_dds_to_quantum_circuit(
     if target_qubits is None:
         target_qubits = [0]
 
-    if pre_post_gate_parameters is None:
-        pre_post_gate_parameters = [np.pi / 2, -pi / 2, pi / 2]
-
-    if len(pre_post_gate_parameters) != 3:
+    if (pre_post_gate_parameters is not None and
+            len(pre_post_gate_parameters) != 3):
         raise ArgumentsValueError('Pre-Post gate parameters must be a list of 3 '
                                   'floating point numbers.',
                                   {'pre_post_gate_params': pre_post_gate_parameters})
@@ -267,12 +267,13 @@ def convert_dds_to_quantum_circuit(
         gate_time=gate_time,
         unitary_time=unitary_time)
 
-    for qubit in target_qubits:
-        quantum_circuit.u3(pre_post_gate_parameters[0], #pylint: disable=no-member
-                           pre_post_gate_parameters[1],
-                           pre_post_gate_parameters[2],
-                           quantum_registers[qubit])
-        quantum_circuit.barrier(quantum_registers[qubit]) #pylint: disable=no-member
+    if pre_post_gate_parameters is not None:
+        for qubit in target_qubits:
+            quantum_circuit.u3(pre_post_gate_parameters[0], #pylint: disable=no-member
+                               pre_post_gate_parameters[1],
+                               pre_post_gate_parameters[2],
+                               quantum_registers[qubit])
+            quantum_circuit.barrier(quantum_registers[qubit]) #pylint: disable=no-member
 
     offset_count = 0
     for gate in circuit_gate_list:
@@ -318,12 +319,13 @@ def convert_dds_to_quantum_circuit(
 
         offset_count += 1
 
-    for qubit in target_qubits:
-        quantum_circuit.u3(pre_post_gate_parameters[0], #pylint: disable=no-member
-                           pre_post_gate_parameters[1],
-                           pre_post_gate_parameters[2],
-                           quantum_registers[qubit])
-        quantum_circuit.barrier(quantum_registers)  # pylint: disable=no-member
+    if pre_post_gate_parameters is not None:
+        for qubit in target_qubits:
+            quantum_circuit.u3(pre_post_gate_parameters[0], #pylint: disable=no-member
+                               pre_post_gate_parameters[1],
+                               pre_post_gate_parameters[2],
+                               quantum_registers[qubit])
+            quantum_circuit.barrier(quantum_registers)  # pylint: disable=no-member
 
     if add_measurement:
         for q_index, qubit in enumerate(target_qubits):
diff --git a/tests/test_qiskit_sequence.py b/tests/test_qiskit_sequence.py
index 40e25a8e..39fa138d 100644
--- a/tests/test_qiskit_sequence.py
+++ b/tests/test_qiskit_sequence.py
@@ -75,7 +75,7 @@ def _create_test_sequence(sequence_scheme):
     return sequence
 
 
-def _check_circuit_unitary(pre_post_gate_parameters):
+def _check_circuit_unitary(pre_post_gate_parameters, multiplier):
     """Check the unitary of a dynamic decoupling operation
     """
 
@@ -83,11 +83,6 @@ def _check_circuit_unitary(pre_post_gate_parameters):
     number_of_shots = 1
     backend_simulator = BasicAer.get_backend(backend)
 
-    if pre_post_gate_parameters is None:
-        multiplier = (1. / np.power(2, 0.5)) * np.array([[1, -1j], [-1j, 1]], dtype='complex')
-    else:
-        multiplier = np.array([[1, 0], [0, 1]])
-
     for sequence_scheme in ['Carr-Purcell', 'Carr-Purcell-Meiboom-Gill',
                             'Uhrig single-axis', 'periodic single-axis', 'Walsh single-axis',
                             'quadratic', 'X concatenated',
@@ -115,9 +110,12 @@ def test_identity_operation():
     """Tests if the Dynamic Decoupling Sequence gives rise to Identity
     operation in Qiskit
     """
+    _multiplier = np.array([[1, 0], [0, 1]])
+    _check_circuit_unitary([0., 0., 0.], _multiplier)
+    _check_circuit_unitary(None, _multiplier)
 
-    _check_circuit_unitary([0., 0., 0.])
-    _check_circuit_unitary(None)
+    _multiplier = (1. / np.power(2, 0.5)) * np.array([[1, -1j], [-1j, 1]], dtype='complex')
+    _check_circuit_unitary([np.pi / 2, -np.pi / 2, np.pi / 2], _multiplier)
 
 if __name__ == '__main__':
     pass