3 files changed, 21 insertions, 3 deletions
diff --git a/tests/unixWm.test b/tests/unixWm.test
index b165826..dc5ed49 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -352,6 +352,12 @@ test unixWm-8.9 {icon windows} {nonPortable} {
     lappend result [winfo ismapped .icon] [wm state .icon]
 } {icon 1 0 0 withdrawn 1 normal}
 
+if {[string compare testwrapper [info commands testwrapper]] != 0} {
+    puts "This application hasn't been compiled with the testwrapper command,"
+    puts "therefore I am skipping all of these tests."
+    return
+}
+
 test unixWm-9.1 {TkWmMapWindow procedure, client property} {unixOnly} {
     catch {destroy .t}
     toplevel .t -width 100 -height 50
diff --git a/tests/window.test b/tests/window.test
index aaa29c0..8706103 100644
--- a/tests/window.test
+++ b/tests/window.test
@@ -80,6 +80,12 @@ test window-2.3 {Tk_DestroyWindow procedure, destroy handler deletes parent} {
     destroy .f
 } {}
 
+if {[string compare testmenubar [info commands testmenubar]] != 0} {
+    puts "This application hasn't been compiled with the testmenubar command,"
+    puts "therefore I am skipping all of these tests."
+    return
+}
+
 test window-3.1 {Tk_MakeWindowExist procedure, stacking order and menubars} unixOnly {
     catch {destroy .t}
     toplevel .t -width 300 -height 200
diff --git a/tests/winfo.test b/tests/winfo.test
index 5d7292f..7f5fe9e 100644
--- a/tests/winfo.test
+++ b/tests/winfo.test
@@ -206,9 +206,15 @@ test winfo-7.6 {"winfo pathname" command} {
 test winfo-7.7 {"winfo pathname" command} {
     winfo pathname -displayof .b [winfo id .]
 } {.}
-test winfo-7.8 {"winfo pathname" command} {unixOnly} {
-    winfo pathname [testwrapper .]
-} {}
+
+if {[string compare testwrapper [info commands testwrapper]] == 0} {
+    puts "This application hasn't been compiled with the testwrapper command,"
+    puts "therefore I am skipping all of these tests."
+
+    test winfo-7.8 {"winfo pathname" command} {unixOnly} {
+        winfo pathname [testwrapper .]
+    } {}
+}
 
 test winfo-8.1 {"winfo pointerx" command} {
     catch [winfo pointerx .b]