diff --git a/patches/handshake_table.c.patch b/patches/handshake_table.c.patch
new file mode 100644
index 0000000..46f2adb
--- /dev/null
+++ b/patches/handshake_table.c.patch
@@ -0,0 +1,18 @@
+--- tests/handshake_table.c.orig	Mon May  4 23:28:43 2020
++++ tests/handshake_table.c	Mon May  4 23:29:50 2020
+@@ -477,6 +477,7 @@
+ 	unsigned int	depth = 0;
+ 	int		ch, graphviz = 0, print = 0;
+ 
++#ifndef _MSC_VER
+ 	while ((ch = getopt(argc, argv, "Cg")) != -1) {
+ 		switch (ch) {
+ 		case 'C':
+@@ -494,6 +495,7 @@
+ 
+ 	if (argc != 0)
+ 		usage();
++#endif
+ 
+ 	if (graphviz && print)
+ 		usage();
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 80b785d..ed63f06 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -225,6 +225,13 @@ add_executable(gost2814789t gost2814789t.c)
 target_link_libraries(gost2814789t ${OPENSSL_LIBS})
 add_test(gost2814789t gost2814789t)
 
+# handshake_table
+if(NOT BUILD_SHARED_LIBS)
+	add_executable(handshake_table handshake_table.c)
+	target_link_libraries(handshake_table ${OPENSSL_LIBS})
+	add_test(handshake_table handshake_table)
+endif()
+
 # hkdf_test
 add_executable(hkdf_test hkdf_test.c)
 target_link_libraries(hkdf_test ${OPENSSL_LIBS})
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7463f26..86db040 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -228,7 +228,8 @@ check_PROGRAMS += gost2814789t
 gost2814789t_SOURCES = gost2814789t.c
 
 # handshake_table
-noinst_PROGRAMS = handshake_table
+TESTS += handshake_table
+check_PROGRAMS += handshake_table
 handshake_table_SOURCES = handshake_table.c
 
 # hkdf_test