diff --git a/sentences/sv/cover_HassTurnOff.yaml b/sentences/sv/cover_HassTurnOff.yaml
index bbf0c66eee..c4a9e074e8 100644
--- a/sentences/sv/cover_HassTurnOff.yaml
+++ b/sentences/sv/cover_HassTurnOff.yaml
@@ -2,12 +2,21 @@ language: sv
 intents:
   HassTurnOff:
     data:
+      - sentences:
+          - <stäng_gardiner> <name>
+        requires_context:
+          domain: cover
+        slots:
+          domain: cover
+        response: cover
+
       - sentences:
           - (regla | <stäng_gardiner>) garagedörren
         response: cover_device_class
         slots:
           device_class: garage
           domain: cover
+
       - sentences:
           - <stäng_gardiner> <gardiner> <i_på> <area>
           - <stäng_gardiner> [<alla>] <area>[s]<gardiner>
diff --git a/sentences/sv/homeassistant_HassTurnOff.yaml b/sentences/sv/homeassistant_HassTurnOff.yaml
index cd638afeba..f6b271812f 100644
--- a/sentences/sv/homeassistant_HassTurnOff.yaml
+++ b/sentences/sv/homeassistant_HassTurnOff.yaml
@@ -4,5 +4,6 @@ intents:
     data:
       - sentences:
           - <slå_av> <name>
-          - <stäng_gardiner> <name>
-        response: cover
+        excludes_context:
+          domain:
+            - cover
diff --git a/tests/sv/cover_HassTurnOff.yaml b/tests/sv/cover_HassTurnOff.yaml
index 45de03e0e5..2f960ade21 100644
--- a/tests/sv/cover_HassTurnOff.yaml
+++ b/tests/sv/cover_HassTurnOff.yaml
@@ -1,39 +1,58 @@
 language: sv
 tests:
   - sentences:
-      - regla garagedörren
+      - Stäng sovrumsgardinen
+      - Dra ner sovrumsgardinen
+      - Dra igen sovrumsgardinen
+      - Stäng igen sovrumsgardinen
+      - Veckla ner sovrumsgardinen
+      - Veckla igen sovrumsgardinen
+      - Tillslut sovrumsgardinen
     intent:
       name: HassTurnOff
       slots:
-        device_class: garage
+        name: Sovrumsgardinen
         domain: cover
-    response: Stängde garage
+    response: "Stängde sovrumsgardinen"
+
   - sentences:
-      - stäng igen rullgardiner i kökets
+      - Stäng garagedörren
+      - Dra igen garagedörren
+      - regla garagedörren
     intent:
       name: HassTurnOff
       slots:
-        area: Kök
-        device_class:
-          - blind
-          - curtain
-          - shutter
+        device_class: garage
         domain: cover
-    response: Stängde i kök
+    response: "Stängde garage"
+
   - sentences:
-      - stäng igen all köketssrullgardiner
+      - Stäng gardiner i sovrummet
+      - Dra för persiennerna i sovrummet
+      - Dra igen sovrummets gardiner
+      - Stäng igen alla sovrumspersienner
+      - Dra för alla sovrumets gardiner
+      - Hissa ner alla sovrumsgardiner
+      - Slå igen sovrumspersiennerna
+      - Slå för förhängena i sovrummet
+      - Dra ner alla sovrumets rullgardiner
+      - Rulla ner alla sovrumsgardiner
     intent:
       name: HassTurnOff
       slots:
-        area: Kök
+        area: Sovrum
         device_class:
           - blind
           - curtain
           - shutter
         domain: cover
-    response: Stängde i kök
+    response: "Stängde i sovrum"
+
   - sentences:
+      - stäng igen rullgardiner i kökets
+      - stäng igen alla köketssrullgardiner
       - stäng igen all kökets rullgardiner
+      - stäng alla kökets rullgardiner
     intent:
       name: HassTurnOff
       slots:
diff --git a/tests/sv/homeassistant_HassTurnOff.yaml b/tests/sv/homeassistant_HassTurnOff.yaml
index a0cb8e88d4..81e9958ada 100644
--- a/tests/sv/homeassistant_HassTurnOff.yaml
+++ b/tests/sv/homeassistant_HassTurnOff.yaml
@@ -7,43 +7,3 @@ tests:
       name: HassTurnOff
       slots:
         name: Sänglampan
-  # - sentences:
-  #     - Stäng sovrumsgardinen
-  #     - Dra ner sovrumsgardinen
-  #     - Dra igen sovrumsgardinen
-  #     - Stäng igen sovrumsgardinen
-  #     - Veckla ner sovrumsgardinen
-  #     - Veckla igen sovrumsgardinen
-  #     - Tillslut sovrumsgardinen
-  #   intent:
-  #     name: HassTurnOff
-  #     slots:
-  #       name: Sovrumsgardinen
-  - sentences:
-      - Stäng garagedörren
-      - Dra igen garagedörren
-    intent:
-      name: HassTurnOff
-      slots:
-        device_class: garage
-        domain: cover
-  - sentences:
-      - Stäng gardiner i sovrummet
-      - Dra för persiennerna i sovrummet
-      - Dra igen sovrummets gardiner
-      - Stäng igen alla sovrumspersienner
-      - Dra för alla sovrumets gardiner
-      - Hissa ner alla sovrumsgardiner
-      - Slå igen sovrumspersiennerna
-      - Slå för förhängena i sovrummet
-      - Dra ner alla sovrumets rullgardiner
-      - Rulla ner alla sovrumsgardiner
-    intent:
-      name: HassTurnOff
-      slots:
-        area: Sovrum
-        device_class:
-          - blind
-          - curtain
-          - shutter
-        domain: cover