3 files changed, 23 insertions, 4 deletions
diff --git a/lib/ssh/test/property_test/ssh_eqc_client_server.erl b/lib/ssh/test/property_test/ssh_eqc_client_server.erl
index 3a84acebb3..cf895ae85e 100644
--- a/lib/ssh/test/property_test/ssh_eqc_client_server.erl
+++ b/lib/ssh/test/property_test/ssh_eqc_client_server.erl
@@ -27,6 +27,10 @@
 -ifdef(PROPER).
 %% Proper is not supported.
 -else.
+-ifdef(TRIQ).
+%% Proper is not supported.
+-else.
+
 
 -include_lib("eqc/include/eqc.hrl").
 -include_lib("eqc/include/eqc_statem.hrl").
@@ -600,3 +604,4 @@ erase_dir(Dir) ->
     file:del_dir(Dir).
 
 -endif.
+-endif.
diff --git a/lib/ssh/test/property_test/ssh_eqc_encode_decode.erl b/lib/ssh/test/property_test/ssh_eqc_encode_decode.erl
index 6ddf2c9972..34630bdc91 100644
--- a/lib/ssh/test/property_test/ssh_eqc_encode_decode.erl
+++ b/lib/ssh/test/property_test/ssh_eqc_encode_decode.erl
@@ -22,20 +22,36 @@
 
 -compile(export_all).
 
+-proptest(eqc).
+-proptest([triq,proper]).
+
+-include_lib("ct_property_test.hrl").
+
 -ifndef(EQC).
 -ifndef(PROPER).
+-ifndef(TRIQ).
 -define(EQC,true).
 %%-define(PROPER,true).
+%%-define(TRIQ,true).
+-endif.
 -endif.
 -endif.
 
 -ifdef(EQC).
 -include_lib("eqc/include/eqc.hrl").
 -define(MOD_eqc,eqc).
+
 -else.
 -ifdef(PROPER).
 -include_lib("proper/include/proper.hrl").
 -define(MOD_eqc,proper).
+
+-else.
+-ifdef(TRIQ).
+-define(MOD_eqc,triq).
+-include_lib("triq/include/triq.hrl").
+
+-endif.
 -endif.
 -endif.
 
diff --git a/lib/ssh/test/ssh_property_test_SUITE.erl b/lib/ssh/test/ssh_property_test_SUITE.erl
index c6c63d7367..ffad8ebbb7 100644
--- a/lib/ssh/test/ssh_property_test_SUITE.erl
+++ b/lib/ssh/test/ssh_property_test_SUITE.erl
@@ -57,10 +57,8 @@ init_per_suite(Config) ->
 %%% if we run proper.
 init_per_group(client_server, Config) ->
     case ?config(property_test_tool,Config) of
-	proper ->
-	    {skip, "PropEr is not supported"};
-	eqc ->
-	    Config
+	eqc -> Config;
+	X -> {skip, lists:concat([X," is not supported"])}
     end;
 init_per_group(_, Config) ->
     Config.