diff --git a/test/python/compiler/__init__.py b/test/python/compiler/__init__.py
new file mode 100644
index 000000000000..5976347b827a
--- /dev/null
+++ b/test/python/compiler/__init__.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2019, IBM.
+#
+# This source code is licensed under the Apache License, Version 2.0 found in
+# the LICENSE.txt file in the root directory of this source tree.
+
+"""Tests for the compiler."""
diff --git a/test/python/compiler/test_assembler.py b/test/python/compiler/test_assembler.py
index d16cf236b805..a32e7d6bcc3d 100644
--- a/test/python/compiler/test_assembler.py
+++ b/test/python/compiler/test_assembler.py
@@ -7,12 +7,13 @@
 
 """Assembler Test."""
 
-import numpy as np
 import unittest
 
-from qiskit.circuit import QuantumRegister, ClassicalRegister, QuantumCircuit
-from qiskit.compiler import assemble_circuits
+import numpy as np
+
+from qiskit.circuit import ClassicalRegister, QuantumCircuit, QuantumRegister
 from qiskit.compiler import RunConfig
+from qiskit.compiler import assemble_circuits
 from qiskit.qobj import QasmQobj
 from qiskit.test import QiskitTestCase
 
@@ -23,12 +24,12 @@ class TestAssembler(QiskitTestCase):
     def test_assemble_single_circuit(self):
         """Test assembling a single circuit.
         """
-        q = QuantumRegister(2, name='q')
-        c = ClassicalRegister(2, name='c')
-        circ = QuantumCircuit(q, c, name='circ')
-        circ.h(q[0])
-        circ.cx(q[0], q[1])
-        circ.measure(q, c)
+        qr = QuantumRegister(2, name='q')
+        cr = ClassicalRegister(2, name='c')
+        circ = QuantumCircuit(qr, cr, name='circ')
+        circ.h(qr[0])
+        circ.cx(qr[0], qr[1])
+        circ.measure(qr, cr)
 
         run_config = RunConfig(shots=2000, memory=True)
         qobj = assemble_circuits(circ, run_config=run_config)
@@ -41,20 +42,20 @@ def test_assemble_single_circuit(self):
     def test_assemble_multiple_circuits(self):
         """Test assembling multiple circuits, all should have the same config.
         """
-        q0 = QuantumRegister(2, name='q0')
-        c0 = ClassicalRegister(2, name='c0')
-        circ0 = QuantumCircuit(q0, c0, name='circ0')
-        circ0.h(q0[0])
-        circ0.cx(q0[0], q0[1])
-        circ0.measure(q0, c0)
-
-        q1 = QuantumRegister(3, name='q1')
-        c1 = ClassicalRegister(3, name='c1')
-        circ1 = QuantumCircuit(q1, c1, name='circ0')
-        circ1.h(q1[0])
-        circ1.cx(q1[0], q1[1])
-        circ1.cx(q1[0], q1[2])
-        circ1.measure(q1, c1)
+        qr0 = QuantumRegister(2, name='q0')
+        qc0 = ClassicalRegister(2, name='c0')
+        circ0 = QuantumCircuit(qr0, qc0, name='circ0')
+        circ0.h(qr0[0])
+        circ0.cx(qr0[0], qr0[1])
+        circ0.measure(qr0, qc0)
+
+        qr1 = QuantumRegister(3, name='q1')
+        qc1 = ClassicalRegister(3, name='c1')
+        circ1 = QuantumCircuit(qr1, qc1, name='circ0')
+        circ1.h(qr1[0])
+        circ1.cx(qr1[0], qr1[1])
+        circ1.cx(qr1[0], qr1[2])
+        circ1.measure(qr1, qc1)
 
         run_config = RunConfig(shots=100, memory=False, seed=6)
         qobj = assemble_circuits([circ0, circ1], run_config=run_config)
@@ -68,12 +69,12 @@ def test_assemble_multiple_circuits(self):
     def test_assemble_no_run_config(self):
         """Test assembling with no run_config, relying on default.
         """
-        q = QuantumRegister(2, name='q')
-        c = ClassicalRegister(2, name='c')
-        circ = QuantumCircuit(q, c, name='circ')
-        circ.h(q[0])
-        circ.cx(q[0], q[1])
-        circ.measure(q, c)
+        qr = QuantumRegister(2, name='q')
+        qc = ClassicalRegister(2, name='c')
+        circ = QuantumCircuit(qr, qc, name='circ')
+        circ.h(qr[0])
+        circ.cx(qr[0], qr[1])
+        circ.measure(qr, qc)
 
         qobj = assemble_circuits(circ)
         self.assertIsInstance(qobj, QasmQobj)
diff --git a/test/python/compiler/test_compiler.py b/test/python/compiler/test_compiler.py
index 93ea010534ac..869ae3672ca2 100644
--- a/test/python/compiler/test_compiler.py
+++ b/test/python/compiler/test_compiler.py
@@ -586,6 +586,7 @@ def test_yzy_zyz_cases(self):
         qobj2 = compile(circ2, backend)
         self.assertIsInstance(qobj2, QasmQobj)
 
+    @unittest.skip('Temporary skipping (see #2025 and #2006')
     def test_move_measurements(self):
         """Measurements applied AFTER swap mapping.
         """