diff --git a/api/autoit/feature/autoit.feature b/api/autoit/feature/autoit.feature
deleted file mode 100644
index e69de29..0000000
diff --git a/api/autoit/feature/steps/steps.py b/api/autoit/feature/steps/steps.py
deleted file mode 100644
index e69de29..0000000
diff --git a/api/autoit/features/autoit.feature b/api/autoit/features/autoit.feature
new file mode 100644
index 0000000..56f72d9
--- /dev/null
+++ b/api/autoit/features/autoit.feature
@@ -0,0 +1,12 @@
+Feature: The AutoIt API client
+# ======================== AutoIt Test ========================
+    Scenario: Testing the AutoIt client
+        Given the AutoIt client
+        When the test method is called
+        Then the string "Autoit Svc Ok" must be returned
+
+# ======================== AutoIt Test ========================
+    Scenario: Using an AutoIt command through AutoIt client
+        Given the AutoIt client
+        When the do method is called with "ClipPut ( "test" )"
+        Then the string "test" must me recorded on ClipBoard
\ No newline at end of file
diff --git a/api/autoit/features/steps/steps.py b/api/autoit/features/steps/steps.py
new file mode 100644
index 0000000..a1f9eee
--- /dev/null
+++ b/api/autoit/features/steps/steps.py
@@ -0,0 +1,3 @@
+from behave import *
+
+from cli import AutoIt
\ No newline at end of file