diff --git a/egs/wsj/s5/utils/fix_data_dir.sh b/egs/wsj/s5/utils/fix_data_dir.sh
index 103a4173dc0..ca0972ca85b 100755
--- a/egs/wsj/s5/utils/fix_data_dir.sh
+++ b/egs/wsj/s5/utils/fix_data_dir.sh
@@ -6,6 +6,8 @@
 # It puts the original contents of data-dir into
 # data-dir/.backup
 
+cmd="$@"
+
 utt_extra_files=
 spk_extra_files=
 
@@ -21,6 +23,12 @@ if [ $# != 1 ]; then
 fi
 
 data=$1
+
+if [ -f $data/images.scp ]; then
+  image/fix_data_dir.sh $cmd
+  exit $?
+fi
+
 mkdir -p $data/.backup
 
 [ ! -d $data ] && echo "$0: no such directory $data" && exit 1;
diff --git a/egs/wsj/s5/utils/validate_data_dir.sh b/egs/wsj/s5/utils/validate_data_dir.sh
index 453ad6935f6..a8b0542c1bb 100755
--- a/egs/wsj/s5/utils/validate_data_dir.sh
+++ b/egs/wsj/s5/utils/validate_data_dir.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+cmd="$@"
 
 no_feats=false
 no_wav=false
@@ -44,6 +45,12 @@ if [ ! -d $data ]; then
   exit 1;
 fi
 
+if [ -f $data/images.scp ]; then
+  cmd=${cmd/--no-wav/}  # remove --no-wav if supplied
+  image/validate_data_dir.sh $cmd
+  exit $?
+fi
+
 for f in spk2utt utt2spk; do
   if [ ! -f $data/$f ]; then
     echo "$0: no such file $f"