diff --git a/tests/src/system/basic/CLISwiftTests.scala b/tests/src/whisk/core/cli/test/SwiftTests.scala
similarity index 98%
rename from tests/src/system/basic/CLISwiftTests.scala
rename to tests/src/whisk/core/cli/test/SwiftTests.scala
index c0fbb71..2f57958 100644
--- a/tests/src/system/basic/CLISwiftTests.scala
+++ b/tests/src/whisk/core/cli/test/SwiftTests.scala
@@ -14,15 +14,13 @@
  * limitations under the License.
  */
 
-package system.basic
+package whisk.core.cli.test
 
 import scala.concurrent.duration.DurationInt
 import scala.language.postfixOps
-
 import org.junit.runner.RunWith
 import org.scalatest.Matchers
 import org.scalatest.junit.JUnitRunner
-
 import common.TestHelpers
 import common.TestUtils
 import common.Wsk
@@ -32,7 +30,7 @@
 import spray.json.pimpAny
 
 @RunWith(classOf[JUnitRunner])
-class CLISwiftTests
+class SwiftTests
     extends TestHelpers
     with WskTestHelpers
     with Matchers {