diff --git a/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs b/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs
index 83af3a53a..60d18e7b7 100644
--- a/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs
+++ b/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs
@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -18,6 +18,26 @@ namespace TBF.BenchControl.TestMethods.LeakTest
     {
 		private static readonly ILog log = LogManager.GetLogger(typeof(LeakTestSeq));
 
+        /// <summary>
+        /// Check capabilities of devces in the output path required for this test method
+        /// </summary>
+        /// <param name="devices">Devices</param>
+        /// <returns>true when capabilities of devices are OK</returns>
+        public static bool CheckDeviceCaps(Config.Entities.Test test, OutputPath devices, out string message)
+        {
+            if (!(StateMachine.ControlBoard is ControlBoard.Legacy.ControlBoardDev) &&
+                !(StateMachine.ControlBoard is ControlBoard.Papouch.CBoard) &&
+                !(StateMachine.ControlBoard is ControlBoard.New.CBoard))
+            {
+                /// Control board does not support this method
+                message = string.Format("{0}: {1}", test.Name, Strings.Test_bench_does_not_suport_selected_test_method);
+                return false;
+            }
+
+            message = string.Empty;
+            return true;
+        }
+
 		/// <summary>
 		/// Flying start mass collection method sequence
 		/// </summary>
diff --git a/TBF/BenchControl/TestMethods/LeakTest/TestMethod.cs b/TBF/BenchControl/TestMethods/LeakTest/TestMethod.cs
index ab048716b..bf2028c1a 100644
--- a/TBF/BenchControl/TestMethods/LeakTest/TestMethod.cs
+++ b/TBF/BenchControl/TestMethods/LeakTest/TestMethod.cs
@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2016 Sensus Metering Systems
+/// Copyright (c) 2013-2021 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
@@ -18,8 +18,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest
         public bool DoTransitions() { return true; }
         public bool CheckDeviceCaps(Test test, OutputPath devices, out string message)
         {
-            message = string.Format("{0}: CheckDeviceCaps() is not implemented yet", Name);
-            return false;
+            return LeakTestSeq.CheckDeviceCaps(test, devices, out message);
         }
 
 
diff --git a/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs b/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs
index 55b1907aa..ed25f9ad0 100644
--- a/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs
+++ b/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs
@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -17,6 +17,26 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
     {
 		private static readonly ILog log = LogManager.GetLogger(typeof(PMaxTestSeq));
 
+        /// <summary>
+        /// Check capabilities of devces in the output path required for this test method
+        /// </summary>
+        /// <param name="devices">Devices</param>
+        /// <returns>true when capabilities of devices are OK</returns>
+        public static bool CheckDeviceCaps(Config.Entities.Test test, OutputPath devices, out string message)
+        {
+            if (!(StateMachine.ControlBoard is ControlBoard.Legacy.ControlBoardDev) &&
+                !(StateMachine.ControlBoard is ControlBoard.Papouch.CBoard) &&
+                !(StateMachine.ControlBoard is ControlBoard.New.CBoard))
+            {
+                /// Control board does not support this method
+                message = string.Format("{0}: {1}", test.Name, Strings.Test_bench_does_not_suport_selected_test_method);
+                return false;
+            }
+
+            message = string.Empty;
+            return true;
+        }
+
 		/// <summary>
 		/// Pressure test sequence
 		/// </summary>
diff --git a/TBF/BenchControl/TestMethods/PMaxTest/TestMethod.cs b/TBF/BenchControl/TestMethods/PMaxTest/TestMethod.cs
index 8f991b523..022491c42 100644
--- a/TBF/BenchControl/TestMethods/PMaxTest/TestMethod.cs
+++ b/TBF/BenchControl/TestMethods/PMaxTest/TestMethod.cs
@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2016 Sensus Metering Systems
+/// Copyright (c) 2013-2021 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
@@ -21,8 +21,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
         public bool DoTransitions() { return true; }
         public bool CheckDeviceCaps(Test test, OutputPath devices, out string message)
         {
-            message = string.Format("{0}: CheckDeviceCaps() is not implemented yet", Name);
-            return false;
+            return PMaxTestSeq.CheckDeviceCaps(test, devices, out message);
         }
 
 
diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index b833a8d2a..3be474653 100644
--- a/TBF/Properties/AssemblyInfo.cs
+++ b/TBF/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Sensus")]
 [assembly: AssemblyProduct("TestBenchFramework")]
-[assembly: AssemblyCopyright("Copyright © 2013 - 2020 Sensus Slovensko, a.s.")]
+[assembly: AssemblyCopyright("Copyright © 2013 - 2021 Sensus Slovensko, a.s.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.1495.0")]
-[assembly: AssemblyFileVersion("3.1.1495.0")]
+[assembly: AssemblyVersion("3.1.1578.0")]
+[assembly: AssemblyFileVersion("3.1.1578.0")]