diff --git a/tests/board_samples/join.sch b/tests/board_samples/join.sch
new file mode 100644
index 00000000..d3b4a856
--- /dev/null
+++ b/tests/board_samples/join.sch
@@ -0,0 +1,101 @@
+EESchema Schematic File Version 4
+EELAYER 30 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 1 1
+Title "KiBom Test Schematic"
+Date "2020-03-12"
+Rev "A"
+Comp "https://github.com/SchrodingersGat/KiBom"
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+Text Notes 550  950  0    50   ~ 0
+This schematic serves as a test-file for the KiBom export script.\n\nAfter making a change to the schematic, remember to re-export the BOM to generate the intermediate .xml file\n\n(The testing framework cannot perform the netlist-export step!)
+$Comp
+L Connector:Conn_01x02_Male J1
+U 1 1 5F10E435
+P 2850 2300
+F 0 "J1" H 2750 2200 50  0000 C CNN
+F 1 "Molex KK" H 2850 2100 50  0000 C CNN
+F 2 "" H 2850 2300 50  0001 C CNN
+F 3 "https://www.molex.com/webdocs/datasheets/pdf/en-us//0022232021_PCB_HEADERS.pdf" H 2850 2300 50  0001 C CNN
+F 4 "900-0022232021-ND" H 2850 2300 50  0001 C CNN "digikey#"
+F 5 "0022232021" H 2850 2300 50  0001 C CNN "manf#"
+F 6 "Molex" H 2850 2300 50  0001 C CNN "manf"
+	1    2850 2300
+	1    0    0    -1  
+$EndComp
+$Comp
+L Connector:Conn_01x02_Male J2
+U 1 1 5F10E81F
+P 4500 2300
+F 0 "J2" H 4450 2200 50  0000 R CNN
+F 1 "Molex KK" H 4700 2100 50  0000 R CNN
+F 2 "" H 4500 2300 50  0001 C CNN
+F 3 "https://www.molex.com/webdocs/datasheets/pdf/en-us//0022232021_PCB_HEADERS.pdf" H 4500 2300 50  0001 C CNN
+F 4 "900-0022232021-ND" H 4500 2300 50  0001 C CNN "digikey#"
+F 5 "0022232021" H 4500 2300 50  0001 C CNN "manf#"
+F 6 "Molex" H 4500 2300 50  0001 C CNN "manf"
+	1    4500 2300
+	-1   0    0    -1  
+$EndComp
+$Comp
+L Device:R R1
+U 1 1 5F10F746
+P 3450 2300
+F 0 "R1" V 3350 2300 50  0000 C CNN
+F 1 "1k" V 3450 2300 50  0000 C CNN
+F 2 "" V 3380 2300 50  0001 C CNN
+F 3 "https://www.bourns.com/docs/product-datasheets/CRxxxxx.pdf" H 3450 2300 50  0001 C CNN
+F 4 "CR0805-JW-102ELFCT-ND" V 3450 2300 50  0001 C CNN "digikey#"
+F 5 "CR0805-JW-102ELF" V 3450 2300 50  0001 C CNN "manf#"
+F 6 "5%" V 3450 2300 50  0001 C CNN "Tolerance"
+F 7 "Bourns" V 3450 2300 50  0001 C CNN "manf"
+	1    3450 2300
+	0    1    1    0   
+$EndComp
+$Comp
+L Device:C C1
+U 1 1 5F10F92F
+P 3750 2500
+F 0 "C1" H 3865 2546 50  0000 L CNN
+F 1 "1nF" H 3865 2455 50  0000 L CNN
+F 2 "" H 3788 2350 50  0001 C CNN
+F 3 "https://content.kemet.com/datasheets/KEM_C1002_X7R_SMD.pdf" H 3750 2500 50  0001 C CNN
+F 4 "399-1147-1-ND" H 3750 2500 50  0001 C CNN "digikey#"
+F 5 "C0805C102K5RACTU" H 3750 2500 50  0001 C CNN "manf#"
+F 6 "10%" H 3750 2500 50  0001 C CNN "Tolerance"
+F 7 "KEMET" H 3750 2500 50  0001 C CNN "manf"
+F 8 "50V" H 3750 2500 50  0001 C CNN "Voltage"
+	1    3750 2500
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3050 2300 3300 2300
+Wire Wire Line
+	3600 2300 3750 2300
+Wire Wire Line
+	3750 2350 3750 2300
+Connection ~ 3750 2300
+Wire Wire Line
+	3750 2300 4300 2300
+Wire Wire Line
+	3050 2400 3200 2400
+Wire Wire Line
+	3200 2400 3200 2750
+Wire Wire Line
+	3200 2750 3750 2750
+Wire Wire Line
+	3750 2750 3750 2650
+Wire Wire Line
+	3750 2750 4150 2750
+Wire Wire Line
+	4150 2750 4150 2400
+Wire Wire Line
+	4150 2400 4300 2400
+Connection ~ 3750 2750
+$EndSCHEMATC
diff --git a/tests/test_plot/test_int_bom.py b/tests/test_plot/test_int_bom.py
index bc3bc7b4..a8218846 100644
--- a/tests/test_plot/test_int_bom.py
+++ b/tests/test_plot/test_int_bom.py
@@ -24,7 +24,8 @@ if prev_dir not in sys.path:
 BOM_DIR = 'BoM'
 REF_COLUMN_NAME = 'References'
 QTY_COLUMN_NAME = 'Quantity Per PCB'
-KIBOM_TEST_HEAD = ['Component', 'Description', 'Part', REF_COLUMN_NAME, 'Value', 'Footprint', QTY_COLUMN_NAME, 'Datasheet',
+COMP_COLUMN_NAME = 'Component'
+KIBOM_TEST_HEAD = [COMP_COLUMN_NAME , 'Description', 'Part', REF_COLUMN_NAME, 'Value', 'Footprint', QTY_COLUMN_NAME, 'Datasheet',
                    'Config']
 KIBOM_TEST_COMPONENTS = ['C1', 'C2', 'C3', 'C4', 'R1', 'R2', 'R3', 'R4', 'R5', 'R7', 'R8', 'R9', 'R10']
 KIBOM_TEST_EXCLUDE = ['R6']
@@ -121,7 +122,7 @@ def test_int_bom_simple_xml():
     rows, header = ctx.load_xml(out)
     # Columns get sorted by name, so we need to take care of it
     for c in KIBOM_TEST_HEAD:
-        if c == 'Component':
+        if c == COMP_COLUMN_NAME:
             continue
         assert adapt_xml(c) in header, "Missing column "+c
     ref_column = header.index(adapt_xml(REF_COLUMN_NAME))
@@ -230,3 +231,28 @@ def test_int_bom_digikey_link():
         assert 'digikey' in c
         logging.debug(c + ' OK')
     ctx.clean_up()
+
+
+def test_int_bom_join_1():
+    prj = 'join'
+    ext = 'csv'
+    ctx = context.TestContextSCH('test_int_bom_join_1', prj, 'int_bom_join_1', BOM_DIR)
+    ctx.run()
+    out = prj + '-bom.' + ext
+    rows, header = ctx.load_csv(out)
+    assert header == [COMP_COLUMN_NAME, REF_COLUMN_NAME, 'Part', 'Value', 'manf', 'digikey#', QTY_COLUMN_NAME]
+    ref_column = header.index(REF_COLUMN_NAME)
+    manf_column = header.index('manf')
+    value_column = header.index('Value')
+    check_kibom_test_netlist(rows, ref_column, 3, [], ['C1', 'J1', 'J2', 'R1'])
+    assert rows[0][ref_column] == 'C1'
+    assert rows[0][value_column] == '1nF 10% 50V'
+    assert rows[0][manf_column] == 'KEMET C0805C102K5RACTU'
+    assert rows[1][ref_column] == 'J1 J2'
+    assert rows[1][value_column] == 'Molex KK'
+    assert rows[1][manf_column] == 'Molex 0022232021'
+    assert rows[2][ref_column] == 'R1'
+    assert rows[2][value_column] == '1k 5%'
+    assert rows[2][manf_column] == 'Bourns CR0805-JW-102ELF'
+    ctx.clean_up()
+
diff --git a/tests/yaml_samples/int_bom_join_1.kiplot.yaml b/tests/yaml_samples/int_bom_join_1.kiplot.yaml
new file mode 100644
index 00000000..d8c1ffab
--- /dev/null
+++ b/tests/yaml_samples/int_bom_join_1.kiplot.yaml
@@ -0,0 +1,21 @@
+# Example KiPlot config file
+kiplot:
+  version: 1
+
+outputs:
+  - name: 'bom_internal'
+    comment: "Bill of Materials in CSV format"
+    type: bom
+    dir: BoM
+    options:
+      format: CSV
+      columns:
+        - References
+        - Part
+        - field: Value
+          join: ['Tolerance', 'Voltage']
+        - field: manf
+          join: manf#
+        - digikey#
+        - Quantity Per PCB
+