diff --git a/python/afdko/buildcff2vf.py b/python/afdko/buildcff2vf.py
index 70c49b1ca..fc4e5c697 100644
--- a/python/afdko/buildcff2vf.py
+++ b/python/afdko/buildcff2vf.py
@@ -77,7 +77,7 @@ def getSubset(subset_Path):
 
 def subset_masters(designspace, subsetDict):
     from fontTools import subset
-    subset_options = subset.Options(notdef_outline=True)
+    subset_options = subset.Options(notdef_outline=True, layout_features='*')
     for ds_source in designspace.sources:
         key = tuple(ds_source.location.items())
         included = set(subsetDict[key])
diff --git a/tests/buildcff2vf_data/expected_output/bug817.ttx b/tests/buildcff2vf_data/expected_output/bug817.ttx
new file mode 100644
index 000000000..45460906f
--- /dev/null
+++ b/tests/buildcff2vf_data/expected_output/bug817.ttx
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ttFont sfntVersion="OTTO" ttLibVersion="3.43">
+
+  <GSUB>
+    <Version value="0x00010000"/>
+    <ScriptList>
+      <!-- ScriptCount=1 -->
+      <ScriptRecord index="0">
+        <ScriptTag value="DFLT"/>
+        <Script>
+          <DefaultLangSys>
+            <ReqFeatureIndex value="65535"/>
+            <!-- FeatureCount=1 -->
+            <FeatureIndex index="0" value="0"/>
+          </DefaultLangSys>
+          <!-- LangSysCount=0 -->
+        </Script>
+      </ScriptRecord>
+    </ScriptList>
+    <FeatureList>
+      <!-- FeatureCount=1 -->
+      <FeatureRecord index="0">
+        <FeatureTag value="test"/>
+        <Feature>
+          <!-- LookupCount=1 -->
+          <LookupListIndex index="0" value="0"/>
+        </Feature>
+      </FeatureRecord>
+    </FeatureList>
+    <LookupList>
+      <!-- LookupCount=1 -->
+      <Lookup index="0">
+        <LookupType value="1"/>
+        <LookupFlag value="0"/>
+        <!-- SubTableCount=1 -->
+        <SingleSubst index="0" Format="1">
+          <Substitution in="A" out="A"/>
+        </SingleSubst>
+      </Lookup>
+    </LookupList>
+  </GSUB>
+
+</ttFont>
diff --git a/tests/buildcff2vf_data/input/bug817/bug817.designspace b/tests/buildcff2vf_data/input/bug817/bug817.designspace
new file mode 100644
index 000000000..855ad9e3f
--- /dev/null
+++ b/tests/buildcff2vf_data/input/bug817/bug817.designspace
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<designspace format="3">
+    <axes>
+        <axis default="368" maximum="1000.0" minimum="0.0" name="weight" tag="wght">
+        </axis>
+    </axes>
+    <sources>
+        <source filename="source_fonts/SourceCode_ExtraLight.ufo" name="master_0">
+            <location>
+                <dimension name="weight" xvalue="0" />
+            </location>
+        </source>
+        <source filename="source_fonts/SourceCode_Regular.ufo" name="master_1">
+            <location>
+                <dimension name="weight" xvalue="368" />
+            </location>
+        </source>
+        <source filename="source_fonts/SourceCode_Black.ufo" name="master_2">
+            <location>
+                <dimension name="weight" xvalue="1000" />
+            </location>
+        </source>
+    </sources>
+    <instances>
+        <instance familyname="Bug 816 TestVF" postscriptfontname="SourceCodeRoman-ExtraLight" stylename="ExtraLight">
+            <location>
+                <dimension name="weight" xvalue="0" />
+            </location>
+        </instance>
+        <instance familyname="Bug 816 TestVF" postscriptfontname="SourceCodeRoman-Regular" stylename="Regular">
+            <location>
+                <dimension name="weight" xvalue="368" />
+            </location>
+        </instance>
+        <instance familyname="Bug 816 TestVF" postscriptfontname="SourceCodeRoman-Black" stylename="Black">
+            <location>
+                <dimension name="weight" xvalue="1000" />
+            </location>
+        </instance>
+    </instances>
+</designspace>
diff --git a/tests/buildcff2vf_data/input/bug817/bug817.subset b/tests/buildcff2vf_data/input/bug817/bug817.subset
new file mode 100644
index 000000000..5b912554d
--- /dev/null
+++ b/tests/buildcff2vf_data/input/bug817/bug817.subset
@@ -0,0 +1,7 @@
+((('weight',0.0),), (('weight', 368.0),),)
+.notdef
+A
+T
+((('weight',1000.0),),)
+.notdef
+A
\ No newline at end of file
diff --git a/tests/buildcff2vf_data/input/bug817/source_fonts/SourceCode_Black.otf b/tests/buildcff2vf_data/input/bug817/source_fonts/SourceCode_Black.otf
new file mode 100644
index 000000000..019cfee60
Binary files /dev/null and b/tests/buildcff2vf_data/input/bug817/source_fonts/SourceCode_Black.otf differ
diff --git a/tests/buildcff2vf_data/input/bug817/source_fonts/SourceCode_ExtraLight.otf b/tests/buildcff2vf_data/input/bug817/source_fonts/SourceCode_ExtraLight.otf
new file mode 100644
index 000000000..5122d55ff
Binary files /dev/null and b/tests/buildcff2vf_data/input/bug817/source_fonts/SourceCode_ExtraLight.otf differ
diff --git a/tests/buildcff2vf_data/input/bug817/source_fonts/SourceCode_Regular.otf b/tests/buildcff2vf_data/input/bug817/source_fonts/SourceCode_Regular.otf
new file mode 100644
index 000000000..a64e385c9
Binary files /dev/null and b/tests/buildcff2vf_data/input/bug817/source_fonts/SourceCode_Regular.otf differ
diff --git a/tests/buildcff2vf_test.py b/tests/buildcff2vf_test.py
index 6273e3601..bbb4f440f 100644
--- a/tests/buildcff2vf_test.py
+++ b/tests/buildcff2vf_test.py
@@ -71,3 +71,18 @@ def test_compatibility_vf():
                                    ['CFF2', ])
     expected_ttx = get_expected_path('bug816.ttx')
     assert differ([expected_ttx, actual_ttx, '-s', '<ttFont sfntVersion'])
+
+
+def test_subset_vf():
+    input_dir = get_input_path('bug817')
+    temp_dir = os.path.join(tempfile.mkdtemp(), 'bug817var')
+    copytree(input_dir, temp_dir)
+    ds_path = os.path.join(temp_dir, 'bug817.designspace')
+    subset_path = os.path.join(temp_dir, 'bug817.subset')
+    runner(CMD + ['-o', 'd', '_{}'.format(
+        ds_path), 'i', '_{}'.format(subset_path)])
+    actual_path = os.path.join(temp_dir, 'bug817.otf')
+    actual_ttx = generate_ttx_dump(actual_path,
+                                   ['GSUB', ])
+    expected_ttx = get_expected_path('bug817.ttx')
+    assert differ([expected_ttx, actual_ttx, '-s', '<ttFont sfntVersion'])