@@ -132,6 +132,63 @@ def test_seed4_num3_input2():
     assert out.strip() == expected.strip()
 
 
+# --------------------------------------------------
+def test_bad_tablefmt():
+    """Dies on bad --tablefmt"""
+
+    bad = 'badformat'
+    rv, out = getstatusoutput(f'{prg} -tf {bad}')
+    assert rv != 0
+    assert re.search(f"argument -tf/--tablefmt: invalid choice: '{bad}'", out)
+
+# --------------------------------------------------
+
+
+def test_seed2_num8_tablefmt_plain():
+    """Runs OK, plain formatting"""
+
+    expected = """
+Exercise              Reps
+Burpees                 39
+Situps                  42
+Crunches                29
+Pushups                 68
+Plank                   35
+Hand-stand pushups      18
+Pullups                 30
+Lunges                  32
+"""
+
+    seed_flag = '-s' if random.choice([0, 1]) else '--seed'
+    num_flag = '-n' if random.choice([0, 1]) else '--num'
+    format_flag = '-tf' if random.choice([0, 1]) else '--tablefmt'
+    cmd = f'{prg} {num_flag} 8 {seed_flag} 2 -f {input1} {format_flag} plain'
+    rv, out = getstatusoutput(cmd)
+    assert rv == 0
+    assert out.strip() == expected.strip()
+
+
+# --------------------------------------------------
+def test_seed4_num3_input2_tablefmt_github():
+    """Runs OK, github formatting"""
+
+    expected = """
+| Exercise          |   Reps |
+|-------------------|--------|
+| Hanging Chads     |     86 |
+| Red Barchettas    |     50 |
+| Squatting Chinups |     35 |
+"""
+
+    seed_flag = '-s' if random.choice([0, 1]) else '--seed'
+    num_flag = '-n' if random.choice([0, 1]) else '--num'
+    format_flag = '-tf' if random.choice([0, 1]) else '--tablefmt'
+    rv, out = getstatusoutput(
+        f'{prg} {num_flag} 3 {seed_flag} 4 -f {input2} {format_flag} github')
+    assert rv == 0
+    assert out.strip() == expected.strip()
+
+
 # --------------------------------------------------
 def random_string():
     """generate a random string"""
 
@@ -45,6 +45,36 @@ def get_args():
                         action='store_true',
                         help='Halve the reps')
 
+    table_formats = ("plain",
+                     "simple",
+                     "github",
+                     "grid",
+                     "fancy_grid",
+                     "pipe",
+                     "orgtbl",
+                     "jira",
+                     "presto",
+                     "pretty",
+                     "psql",
+                     "rst",
+                     "mediawiki",
+                     "moinmoin",
+                     "youtrack",
+                     "html",
+                     "unsafehtml",
+                     "latex",
+                     "latex_raw",
+                     "latex_booktabs",
+                     "latex_longtable",
+                     "textile",
+                     "tsv")
+
+    parser.add_argument('-tf',
+                        '--tablefmt',
+                        default='simple',
+                        choices=table_formats,
+                        help='Output formatting')                
+
     args = parser.parse_args()
     if(args.num <= 0):
         parser.error(f'--num "{args.num}" must be greater than 0')
@@ -89,7 +119,7 @@ def main():
         if args.easy:
             reps = int(reps/2)
         workout.append((name, reps))
-    print(tabulate(workout, headers=('Exercise', 'Reps')))
+    print(tabulate(workout, headers=('Exercise', 'Reps'), tablefmt=args.tablefmt))
 
 
 if __name__ == '__main__':